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/04 15:10:41 UTC
[1/9] fauxton commit: updated refs/heads/secondary-indexes to bcc6dc2
Repository: couchdb-fauxton
Updated Branches:
refs/heads/secondary-indexes e228123f1 -> bcc6dc211 (forced update)
Add basic test file for all view files
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5d473250
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5d473250
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5d473250
Branch: refs/heads/secondary-indexes
Commit: 5d473250916f3366843c047c97a36cfd14a1fb42
Parents: 57923f4
Author: Garren Smith <ga...@gmail.com>
Authored: Mon Jul 28 15:53:51 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Jul 28 15:53:51 2014 +0200
----------------------------------------------------------------------
.../documents/tests/views-advancedoptsSpec.js | 32 +++++++++++++++++++
app/addons/documents/tests/views-changesSpec.js | 33 ++++++++++++++++++++
.../documents/tests/views-doceditorSpec.js | 33 ++++++++++++++++++++
app/addons/documents/tests/views-indexSpec.js | 33 ++++++++++++++++++++
app/addons/documents/tests/views-sidebarSpec.js | 33 ++++++++++++++++++++
5 files changed, 164 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5d473250/app/addons/documents/tests/views-advancedoptsSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/views-advancedoptsSpec.js b/app/addons/documents/tests/views-advancedoptsSpec.js
new file mode 100644
index 0000000..3f9373b
--- /dev/null
+++ b/app/addons/documents/tests/views-advancedoptsSpec.js
@@ -0,0 +1,32 @@
+// 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.
+define([
+ 'addons/documents/views-advancedopts',
+ 'testUtils'
+], function (Views, testUtils) {
+ var assert = testUtils.assert,
+ ViewSandbox = testUtils.ViewSandbox,
+ viewSandbox;
+
+ describe('Documents AdvancedOptions', function () {
+ var view;
+ beforeEach(function () {
+ viewSandbox = new ViewSandbox();
+ viewSandbox.renderView(view);
+ });
+
+ afterEach(function () {
+ viewSandbox.remove();
+ });
+ });
+});
+
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5d473250/app/addons/documents/tests/views-changesSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/views-changesSpec.js b/app/addons/documents/tests/views-changesSpec.js
new file mode 100644
index 0000000..51ccb92
--- /dev/null
+++ b/app/addons/documents/tests/views-changesSpec.js
@@ -0,0 +1,33 @@
+// 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.
+define([
+ 'addons/documents/views-changes',
+ 'testUtils'
+], function (Views, testUtils) {
+ var assert = testUtils.assert,
+ ViewSandbox = testUtils.ViewSandbox,
+ viewSandbox;
+
+ describe('Documents Changes', function () {
+ var view;
+ beforeEach(function () {
+ viewSandbox = new ViewSandbox();
+ viewSandbox.renderView(view);
+ });
+
+ afterEach(function () {
+ viewSandbox.remove();
+ });
+ });
+});
+
+
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5d473250/app/addons/documents/tests/views-doceditorSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/views-doceditorSpec.js b/app/addons/documents/tests/views-doceditorSpec.js
new file mode 100644
index 0000000..480d160
--- /dev/null
+++ b/app/addons/documents/tests/views-doceditorSpec.js
@@ -0,0 +1,33 @@
+// 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.
+define([
+ 'addons/documents/views-doceditor',
+ 'testUtils'
+], function (Views, testUtils) {
+ var assert = testUtils.assert,
+ ViewSandbox = testUtils.ViewSandbox,
+ viewSandbox;
+
+ describe('Documents Doc Editor', function () {
+ var view;
+ beforeEach(function () {
+ viewSandbox = new ViewSandbox();
+ viewSandbox.renderView(view);
+ });
+
+ afterEach(function () {
+ viewSandbox.remove();
+ });
+ });
+});
+
+
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5d473250/app/addons/documents/tests/views-indexSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/views-indexSpec.js b/app/addons/documents/tests/views-indexSpec.js
new file mode 100644
index 0000000..7012a04
--- /dev/null
+++ b/app/addons/documents/tests/views-indexSpec.js
@@ -0,0 +1,33 @@
+// 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.
+define([
+ 'addons/documents/views-index',
+ 'testUtils'
+], function (Views, testUtils) {
+ var assert = testUtils.assert,
+ ViewSandbox = testUtils.ViewSandbox,
+ viewSandbox;
+
+ describe('Documents Indexes', function () {
+ var view;
+ beforeEach(function () {
+ viewSandbox = new ViewSandbox();
+ viewSandbox.renderView(view);
+ });
+
+ afterEach(function () {
+ viewSandbox.remove();
+ });
+ });
+});
+
+
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5d473250/app/addons/documents/tests/views-sidebarSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/views-sidebarSpec.js b/app/addons/documents/tests/views-sidebarSpec.js
new file mode 100644
index 0000000..216a21b
--- /dev/null
+++ b/app/addons/documents/tests/views-sidebarSpec.js
@@ -0,0 +1,33 @@
+// 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.
+define([
+ 'addons/documents/views-sidebar',
+ 'testUtils'
+], function (Views, testUtils) {
+ var assert = testUtils.assert,
+ ViewSandbox = testUtils.ViewSandbox,
+ viewSandbox;
+
+ describe('Documents Sidebar', function () {
+ var view;
+ beforeEach(function () {
+ viewSandbox = new ViewSandbox();
+ viewSandbox.renderView(view);
+ });
+
+ afterEach(function () {
+ viewSandbox.remove();
+ });
+ });
+});
+
+
[9/9] fauxton commit: updated refs/heads/secondary-indexes to bcc6dc2
Posted by de...@apache.org.
buncha editor stuff
making the preview page look less butts.
Styling the view form
documents
This stuff can't be tables. Boo.
less for indexes
resize stuff
And more refactor stuff
View editor updates,
Splitting out less files
An absolute abortion happening in the resizeColumns file
style form fields and tab buttons
move around query options, init style
routes stuff
removed the breadcrumbs POC
Step one in cleaning up that gnarly save on indexes
Always show editor
fixing layout
Adding Views, testing header stuff, fixing layout issues
Add all the indexes to the sidebar
Fix sidebar to work with different indexes
Added the apache license
changed a comment ffs.
Ripping out views into it's own addon
Setting Up Indexes addon
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/bcc6dc21
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/bcc6dc21
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/bcc6dc21
Branch: refs/heads/secondary-indexes
Commit: bcc6dc2113d49d896adb791a2af4bb50205488c5
Parents: 07945ec
Author: deathbearbrown <de...@gmail.com>
Authored: Sat Aug 2 17:24:51 2014 +0200
Committer: deathbearbrown <de...@gmail.com>
Committed: Mon Aug 4 09:07:48 2014 -0400
----------------------------------------------------------------------
.gitignore | 1 +
.../documents/assets/less/advancedOptions.less | 93 +++
app/addons/documents/assets/less/changes.less | 12 +
app/addons/documents/assets/less/documents.less | 12 +-
app/addons/documents/assets/less/sidenav.less | 12 +
app/addons/documents/resources.js | 205 ------
app/addons/documents/routes.js | 171 +----
.../documents/templates/advanced_options.html | 218 +++---
.../documents/templates/all_docs_item.html | 26 +-
.../documents/templates/all_docs_list.html | 6 +-
.../templates/design_doc_selector.html | 38 --
.../documents/templates/header_alldocs.html | 36 +
.../documents/templates/header_doc_edit.html | 33 +
.../documents/templates/index_menu_item.html | 4 +-
.../documents/templates/index_row_docular.html | 29 -
.../documents/templates/index_row_tabular.html | 25 -
app/addons/documents/views-index.js | 574 ----------------
app/addons/documents/views-sidebar.js | 53 +-
app/addons/documents/views.js | 99 ++-
app/addons/fauxton/components.js | 11 +-
app/addons/fauxton/resizeColumns.js | 56 +-
app/addons/fauxton/templates/menu_dropdown.html | 6 +-
app/addons/indexes/assets/less/doc-item.less | 83 +++
app/addons/indexes/assets/less/index-form.less | 27 +
app/addons/indexes/assets/less/indexes.less | 17 +
.../assets/less/new-index-placeholder.less | 25 +
app/addons/indexes/base.js | 74 ++
app/addons/indexes/index-components.js | 30 +
app/addons/indexes/resources.js | 285 ++++++++
app/addons/indexes/routes-core.js | 129 ++++
app/addons/indexes/routes-list.js | 70 ++
app/addons/indexes/routes-show.js | 71 ++
app/addons/indexes/routes-viewindexes.js | 106 +++
app/addons/indexes/routes.js | 24 +
.../indexes/templates/design_doc_selector.html | 38 ++
app/addons/indexes/templates/index_header.html | 30 +
.../indexes/templates/index_row_docular.html | 35 +
app/addons/indexes/templates/list_editor.html | 39 ++
.../indexes/templates/preview_screen.html | 16 +
app/addons/indexes/templates/show_editor.html | 41 ++
app/addons/indexes/templates/view_editor.html | 80 +++
app/addons/indexes/views.js | 678 ++++++++++++++++++
app/templates/layouts/two_pane.html | 16 +-
app/templates/layouts/with_tabs_sidebar.html | 3 -
assets/img/couchWatermark.png | Bin 0 -> 7053 bytes
assets/less/fauxton.less | 681 +------------------
assets/less/formstyles.less | 247 +++++++
assets/less/templates.less | 517 ++++++++++++++
settings.json.default | 1 +
49 files changed, 3167 insertions(+), 1916 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 1baaaf1..4d2ca75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ app/addons/*
!app/addons/replication
!app/addons/contribute
!app/addons/auth
+!app/addons/indexes
!app/addons/exampleAuth
!app/addons/permissions
!app/addons/verifyinstall
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/assets/less/advancedOptions.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/advancedOptions.less b/app/addons/documents/assets/less/advancedOptions.less
index 2e29d38..b68dfd5 100644
--- a/app/addons/documents/assets/less/advancedOptions.less
+++ b/app/addons/documents/assets/less/advancedOptions.less
@@ -1 +1,94 @@
+// 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.
+/*ALL DOCS TABLE*/
+
/*for advanced options css*/
+#query {
+ .border-radius(5px);
+ width: 490px;
+ position: absolute;
+ z-index: 11;
+ background-color: #333;
+ padding: 0;
+ .well {
+ background: none;
+ border: none;
+ color: #fff;
+ padding: 0;
+ margin: 0;
+ .query-group {
+ padding: 20px;
+ border-bottom: 1px solid #555;
+ }
+ .query-group:last-child {
+ border-bottom: none;
+ }
+ .controls-group {
+ margin: 0;
+ }
+ .controls-group:last-child {
+ margin: 0;
+ }
+ }
+ form {
+ margin-bottom: 0;
+ .dropdown.inline {
+ display: inline-block;
+ }
+ input[type="text"],
+ textarea {
+ .border-radius(5px);
+ background-color: #666;
+ padding: 8px;
+ border: none;
+ color: #eee;
+ }
+ .btn-success {
+ .border-radius(5px);
+ }
+ }
+ .toggle-btns {
+ .btn {
+ padding: 5px 5px 3px;
+ background: #727A82;
+ color: #fff;
+ font-size: 12px;
+ border: none;
+ }
+ .btn.active {
+ background: #fff;
+ color: #E33F3B;
+ box-shadow: 2px 2px 0px rgba(0, 0, 0, 0.25) inset, 2px 2px 2px rgba(0, 0, 0, 0.15);
+ }
+ label:first-child {
+ .border-radius(5px 0 0 5px);
+ }
+ label:last-child {
+ .border-radius(0 5px 5px 0);
+ margin-left: 1px;
+ }
+ }
+}
+#query:before {
+ content: '';
+ position: absolute;
+ top: -25px;
+ left: 30px;
+ border-color: transparent transparent #333 transparent;
+ border-style: solid;
+ border-width: 15px;
+ width: 0;
+ height: 0;
+}
+#button-options {
+ margin-top: 20px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/assets/less/changes.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/changes.less b/app/addons/documents/assets/less/changes.less
index 96e6d19..ebd395a 100644
--- a/app/addons/documents/assets/less/changes.less
+++ b/app/addons/documents/assets/less/changes.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.
+
/** used in changes.html **/
.change-box {
margin: 0 20px 20px 20px;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/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 2b29744..b52e54f 100644
--- a/app/addons/documents/assets/less/documents.less
+++ b/app/addons/documents/assets/less/documents.less
@@ -9,7 +9,7 @@
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
// License for the specific language governing permissions and limitations under
// the License.
-/*ALL DOCS TABLE*/
+
@import "../../../../../assets/less/variables.less";
@import "../../../../../assets/less/bootstrap/variables.less";
@@ -21,11 +21,6 @@
tr.all-docs-item {
border: none;
background: transparent;
- .btn-group {
- position: absolute;
- right: 0;
- top: 6px;
- }
}
button.beautify {
margin-top: 20px;
@@ -58,7 +53,7 @@ button.beautify {
position: relative;
}
- table td div div {
+ table td div div.btn-group {
display: none;
line-height: 1;
position: absolute;
@@ -169,6 +164,3 @@ button.string-edit[disabled] {
-
-
-
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/assets/less/sidenav.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/sidenav.less b/app/addons/documents/assets/less/sidenav.less
index 477af7a..fa65a23 100644
--- a/app/addons/documents/assets/less/sidenav.less
+++ b/app/addons/documents/assets/less/sidenav.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.
+
.sidenav{
.nav-list > .active > a{
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/resources.js b/app/addons/documents/resources.js
index dc71153..d953dd1 100644
--- a/app/addons/documents/resources.js
+++ b/app/addons/documents/resources.js
@@ -493,211 +493,6 @@ function(app, FauxtonAPI, PagingCollection) {
}
});
- Documents.IndexCollection = PagingCollection.extend({
- model: Documents.ViewRow,
- documentation: function(){
- return "docs";
- },
- initialize: function(_models, options) {
- this.database = options.database;
- this.params = _.extend({limit: 20, reduce: false}, options.params);
-
- this.idxType = "_view";
- this.view = options.view;
- this.design = options.design.replace('_design/','');
- this.perPageLimit = options.perPageLimit || 20;
-
- if (!this.params.limit) {
- this.params.limit = this.perPageLimit;
- }
- },
-
- urlRef: function(context, params) {
- var query = "";
-
- if (params) {
- if (!_.isEmpty(params)) {
- query = "?" + $.param(params);
- } else {
- query = '';
- }
- } else if (this.params) {
- var parsedParam = Documents.QueryParams.stringify(this.params);
- query = "?" + $.param(parsedParam);
- }
-
- var startOfUrl = app.host;
- if (context === 'app') {
- startOfUrl = 'database';
- } else if (context === "apiurl"){
- startOfUrl = window.location.origin;
- }
- var design = app.utils.safeURLName(this.design),
- view = app.utils.safeURLName(this.view);
-
- var url = [startOfUrl, this.database.safeID(), "_design", design, this.idxType, view];
- return url.join("/") + query;
- },
-
- url: function () {
- return this.urlRef.apply(this, arguments);
- },
-
- totalRows: function() {
- if (this.params.reduce) { return "unknown_reduce";}
-
- return this.viewMeta.total_rows || "unknown";
- },
-
- updateSeq: function() {
- return this.viewMeta.update_seq || false;
- },
-
- simple: function () {
- var docs = this.map(function (item) {
- return {
- _id: item.id,
- key: item.get('key'),
- value: item.get('value')
- };
- });
-
- return new Documents.IndexCollection(docs, {
- database: this.database,
- params: this.params,
- view: this.view,
- design: this.design
- });
- },
-
- parse: function(resp) {
- var rows = resp.rows;
- this.endTime = new Date().getTime();
- this.requestDuration = (this.endTime - this.startTime);
-
- return PagingCollection.prototype.parse.apply(this, arguments);
- },
-
- buildAllDocs: function(){
- this.fetch();
- },
-
- // We implement our own fetch to store the starttime so we that
- // we can get the request duration
- fetch: function () {
- this.startTime = new Date().getTime();
- return PagingCollection.prototype.fetch.call(this);
- },
-
- allDocs: function(){
- return this.models;
- },
-
- // This is taken from futon.browse.js $.timeString
- requestDurationInString: function () {
- var ms, sec, min, h, timeString, milliseconds = this.requestDuration;
-
- sec = Math.floor(milliseconds / 1000.0);
- min = Math.floor(sec / 60.0);
- sec = (sec % 60.0).toString();
- if (sec.length < 2) {
- sec = "0" + sec;
- }
-
- h = (Math.floor(min / 60.0)).toString();
- if (h.length < 2) {
- h = "0" + h;
- }
-
- min = (min % 60.0).toString();
- if (min.length < 2) {
- min = "0" + min;
- }
-
- timeString = h + ":" + min + ":" + sec;
-
- ms = (milliseconds % 1000.0).toString();
- while (ms.length < 3) {
- ms = "0" + ms;
- }
- timeString += "." + ms;
-
- return timeString;
- }
-
- });
-
-
- Documents.PouchIndexCollection = PagingCollection.extend({
- model: Documents.ViewRow,
- documentation: function(){
- return "docs";
- },
- initialize: function(_models, options) {
- this.database = options.database;
- this.rows = options.rows;
- this.view = options.view;
- this.design = options.design.replace('_design/','');
- this.params = _.extend({limit: 20, reduce: false}, options.params);
-
- this.idxType = "_view";
- },
-
- url: function () {
- return '';
- },
-
- simple: function () {
- var docs = this.map(function (item) {
- return {
- _id: item.id,
- key: item.get('key'),
- value: item.get('value')
- };
- });
-
- return new Documents.PouchIndexCollection(docs, {
- database: this.database,
- params: this.params,
- view: this.view,
- design: this.design,
- rows: this.rows
- });
-
- },
-
- fetch: function() {
- var deferred = FauxtonAPI.Deferred();
- this.reset(this.rows, {silent: true});
-
- this.viewMeta = {
- total_rows: this.rows.length,
- offset: 0,
- update_seq: false
- };
-
- deferred.resolve();
- return deferred;
- },
-
- totalRows: function() {
- return this.viewMeta.total_rows || "unknown";
- },
-
- updateSeq: function() {
- return this.viewMeta.update_seq || false;
- },
-
- buildAllDocs: function(){
- this.fetch();
- },
-
- allDocs: function(){
- return this.models;
- }
- });
-
-
return Documents;
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index 3fd94f9..f1fd2e2 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -14,12 +14,11 @@ define([
"app",
"api",
-
+ "addons/fauxton/components",
// Modules
//views
"addons/documents/views",
"addons/documents/views-changes",
- "addons/documents/views-index",
"addons/documents/views-doceditor",
"addons/databases/base",
@@ -27,7 +26,7 @@ define([
"addons/fauxton/components"
],
-function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resources, Components) {
+function(app, FauxtonAPI, Components, Documents, Changes, DocEditor, Databases, Resources) {
var DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
layout: "one_pane",
@@ -134,34 +133,16 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
route: "allDocs",
roles: ["_reader","_writer","_admin"]
},
- "database/:database/_design/:ddoc/_view/:view": {
- route: "viewFn",
- roles: ['_admin']
- },
- "database/:database/_design/:ddoc/_lists/:fn": {
- route: "tempFn",
- roles: ['_admin']
- },
- "database/:database/_design/:ddoc/_filters/:fn": {
- route: "tempFn",
- roles: ['_admin']
- },
- "database/:database/_design/:ddoc/_show/:fn": {
- route: "tempFn",
- roles: ['_admin']
- },
"database/:database/_design/:ddoc/metadata": {
route: "designDocMetadata",
roles: ['_admin']
},
- "database/:database/new_view": "newViewEditor",
- "database/:database/new_view/:designDoc": "newViewEditor",
"database/:database/_changes(:params)": "changes"
},
events: {
"route:updateAllDocs": "updateAllDocsFromView",
- "route:updatePreviewDocs": "updateAllDocsFromPreview",
+ // "route:updatePreviewDocs": "updateAllDocsFromPreview",
"route:reloadDesignDocs": "reloadDesignDocs",
"route:paginate": "paginate",
"route:perPageChange": "perPageChange",
@@ -194,6 +175,7 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
database: this.data.database
}));
},
+
designDocMetadata: function(database, ddoc){
this.toolsView && this.toolsView.remove();
this.viewEditor && this.viewEditor.remove();
@@ -216,15 +198,6 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
this.apiUrl = [designDocInfo.url('apiurl'), designDocInfo.documentation() ];
},
- tempFn: function(databaseName, ddoc, fn){
- this.setView("#dashboard-upper-content", new Documents.Views.temp({}));
- this.crumbs = function () {
- return [
- {"name": this.data.database.id, "link": Databases.databaseUrl(this.data.database)},
- ];
- };
-
- },
establish: function () {
return this.data.designDocs.fetch({reset: true});
@@ -289,56 +262,6 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
this.apiUrl = [this.data.database.allDocs.urlRef("apiurl", urlParams), this.data.database.allDocs.documentation() ];
},
- viewFn: function (databaseName, ddoc, view) {
- var params = this.createParams(),
- urlParams = params.urlParams,
- docParams = params.docParams,
- decodeDdoc = decodeURIComponent(ddoc);
-
- view = view.replace(/\?.*$/,'');
-
- this.data.indexedDocs = new Documents.IndexCollection(null, {
- database: this.data.database,
- design: decodeDdoc,
- view: view,
- params: docParams,
- paging: {
- pageSize: this.getDocPerPageLimit(urlParams, parseInt(docParams.limit, 10))
- }
- });
-
- this.viewEditor = this.setView("#dashboard-upper-content", new Index.ViewEditor({
- model: this.data.database,
- ddocs: this.data.designDocs,
- viewName: view,
- params: urlParams,
- newView: false,
- database: this.data.database,
- ddocInfo: this.ddocInfo(decodeDdoc, this.data.designDocs, view)
- }));
-
- this.toolsView && this.toolsView.remove();
-
- this.documentsView = this.createViewDocumentsView({
- designDoc: decodeDdoc,
- docParams: docParams,
- urlParams: urlParams,
- database: this.data.database,
- indexedDocs: this.data.indexedDocs,
- designDocs: this.data.designDocs,
- view: view
- });
-
- this.sidebar.setSelectedTab(app.utils.removeSpecialCharacters(ddoc) + '_' + app.utils.removeSpecialCharacters(view));
-
- this.crumbs = function () {
- return [
- {"name": this.data.database.id, "link": Databases.databaseUrl(this.data.database)},
- ];
- };
-
- this.apiUrl = [this.data.indexedDocs.urlRef("apiurl", urlParams), "docs"];
- },
ddocInfo: function (designDoc, designDocs, view) {
return {
@@ -348,40 +271,18 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
};
},
- createViewDocumentsView: function (options) {
+ // createViewDocumentsView: function (options) {
- return this.setView("#dashboard-lower-content", new Documents.Views.AllDocsList({
- database: options.database,
- collection: options.indexedDocs,
- nestedView: Documents.Views.Row,
- viewList: true,
- ddocInfo: this.ddocInfo(options.designDoc, options.designDocs, options.view),
- docParams: options.docParams,
- params: options.urlParams
- }));
- },
-
- newViewEditor: function (database, designDoc) {
- var params = app.getParams();
-
- this.toolsView && this.toolsView.remove();
- this.documentsView && this.documentsView.remove();
-
- this.viewEditor = this.setView("#dashboard-upper-content", new Index.ViewEditor({
- currentddoc: "_design/"+designDoc || "",
- ddocs: this.data.designDocs,
- params: params,
- database: this.data.database,
- newView: true
- }));
-
- this.sidebar.setSelectedTab('new-view');
- this.crumbs = function () {
- return [
- {"name": this.data.database.id, "link": Databases.databaseUrl(this.data.database)},
- ];
- };
- },
+ // return this.setView("#dashboard-lower-content", new Documents.Views.AllDocsList({
+ // database: options.database,
+ // collection: options.indexedDocs,
+ // nestedView: Documents.Views.Row,
+ // viewList: true,
+ // ddocInfo: this.ddocInfo(options.designDoc, options.designDocs, options.view),
+ // docParams: options.docParams,
+ // params: options.urlParams
+ // }));
+ // },
updateAllDocsFromView: function (event) {
var view = event.view,
@@ -401,28 +302,6 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
collection = this.data.database.allDocs;
collection.paging.pageSize = pageSize;
- } else {
- collection = this.data.indexedDocs = new Documents.IndexCollection(null, {
- database: this.data.database,
- design: ddoc,
- view: view,
- params: docParams,
- paging: {
- pageSize: pageSize
- }
- });
-
- if (!this.documentsView) {
- this.documentsView = this.createViewDocumentsView({
- designDoc: ddoc,
- docParams: docParams,
- urlParams: urlParams,
- database: this.data.database,
- indexedDocs: this.indexedDocs,
- designDocs: this.data.designDocs,
- view: view
- });
- }
}
this.documentsView.setCollection(collection);
@@ -432,26 +311,6 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
this.apiUrl = [collection.urlRef("apiurl", urlParams), "docs"];
},
- updateAllDocsFromPreview: function (event) {
- var view = event.view,
- rows = event.rows,
- ddoc = event.ddoc;
-
- this.data.indexedDocs = new Documents.PouchIndexCollection(null, {
- database: this.data.database,
- design: ddoc,
- view: view,
- rows: rows
- });
-
- this.documentsView = this.setView("#dashboard-lower-content", new Documents.Views.AllDocsList({
- database: this.data.database,
- collection: this.data.indexedDocs,
- nestedView: Documents.Views.Row,
- viewList: true
- }));
- },
-
perPageChange: function (perPage) {
// We need to restore the collection parameters to the defaults (1st page)
// and update the page size
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/templates/advanced_options.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/advanced_options.html b/app/addons/documents/templates/advanced_options.html
index c986d4e..c6268fb 100644
--- a/app/addons/documents/templates/advanced_options.html
+++ b/app/addons/documents/templates/advanced_options.html
@@ -11,57 +11,119 @@ 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="errors-container"></div>
<form class="js-view-query-update custom-inputs">
-<!-- tabs for choosing Keys or Start & end -->
+ <div class="query-group">
+ <span class="add-on">
+ API Options
+ <a class="help-link" href="<%-getDocUrl(documentation)%>" target="_blank">
+ <i class="icon-question-sign"></i>
+ </a>
+ </span>
- <div class="btn-group toggle-btns row-fluid">
- <label for="showKeys" class="drop-down btn span6">
- By Key(s)
- </label>
- <label for="showStartEnd" class="drop-down btn span6">
- Between Keys
- </label>
- </div>
+ <div class="errors-container"></div>
+
+ <div class="controls-group">
+ <div class="row-fluid">
+
+ <div class="checkbox inline">
+ <input id="select2" name="include_docs" type="checkbox" value="true">
+ <label for="include_docs">Include Docs</label>
+ </div>
+
+ <% if (hasReduce) { %>
+ <div class="checkbox inline">
+ <input id="check2" name="reduce" type="checkbox" value="true">
+ <label for="check2">Reduce</label>
+ </div>
+
+ <label id="select1" class="drop-down inline">
+ Group Level
+ <select id="select1" disabled name="group_level" class="input-small">
+ <option value="0">None</option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="999" selected="selected">Exact</option>
+ </select>
+ </label>
+ <% } %>
- <div class="controls-group well hide js-query-keys-wrapper">
- <div class="row-fluid" id="js-showKeys">
- <div class="controls controls-row">
- <label for="keys-input" class="drop-down">A key, or an array of keys.</label>
- <textarea id="keys-input" name="keys" class="input-xxlarge" rows="5" type="text" placeholder='Enter valid JSON; e.g., ["1234"] or ["1234","2345"]'></textarea>
- <div id="keys-error" class="inline-block js-keys-error"></div>
+ </div>
</div>
+ </div>
+
+ <div class="query-group">
+ <span class="add-on">
+ Keys
+ </span>
+ <!-- tabs for choosing Keys or Start & end -->
+ <div class="btn-group toggle-btns row-fluid">
+ <label for="showKeys" class="drop-down btn">
+ By Key(s)
+ </label>
+ <label for="showStartEnd" class="drop-down btn">
+ Between Keys
+ </label>
</div>
- <div class="row-fluid hide" id="js-showStartEnd">
- <div class="controls controls-row">
- <div class="span6">
- <label for="startkey" class="drop-down">Start key</label>
- <input name="startkey" id="startkey" type="text" placeholder='e.g., "1234"' disabled>
+
+ <div class="controls-group well hide js-query-keys-wrapper">
+ <div class="row-fluid" id="js-showKeys">
+ <div class="controls controls-row">
+ <label for="keys-input" class="drop-down">A key, or an array of keys.</label>
+ <textarea id="keys-input" name="keys" class="input-xxlarge" rows="5" type="text" placeholder='Enter valid JSON; e.g., ["1234"] or ["1234","2345"]'></textarea>
+ <div id="keys-error" class="inline-block js-keys-error"></div>
</div>
- <div class="span6">
- <label for="endkey" class="drop-down">End key</label>
- <input id="endkey" name="endkey" type="text" placeholder='e.g., "1234"'>
- <div class="controls controls-row checkbox inline">
- <input id="check5" name="inclusive_end" type="checkbox" value="true" checked disabled>
- <label for="check5">Include End Key in results</label>
+ </div>
+ <div class="row-fluid hide" id="js-showStartEnd">
+ <div class="controls controls-row">
+ <div>
+ <label for="startkey" class="drop-down">Start key</label>
+ <input name="startkey" id="startkey" type="text" placeholder='e.g., "1234"' disabled>
+ </div>
+ <div>
+ <label for="endkey" class="drop-down">End key</label>
+ <input id="endkey" name="endkey" type="text" placeholder='e.g., "1234"'>
+ <div class="controls controls-row checkbox inline">
+ <input id="check5" name="inclusive_end" type="checkbox" value="true" checked disabled>
+ <label for="check5">Include End Key in results</label>
+ </div>
</div>
+
</div>
</div>
-
</div>
</div>
-<!-- Limit and Skip are conditional -->
-
- <div class="controls-group">
+ <div class="controls-group query-group">
+ <!-- Limit and Skip are conditional -->
+ <span class="add-on">
+ Additional Parameters
+ </span>
<div class="row-fluid">
- <div class="span6">
- <label class="drop-down inline">
+ <% if (showStale) { %>
+ <div class="checkbox inline">
+ <input id="check7" name="stale" type="checkbox" value="ok">
+ <label for="check7">Stale</label>
+ </div>
+ <% } %>
+ <div class="checkbox inline">
+ <input id="check6" name="update_seq" type="checkbox" value="true">
+ <label for="check6">Update Sequence</label>
+ </div>
+
+ <div class="dropdown inline">
+ <label class="drop-down">
Limit:
- <select name="limit" class="input-medium">
+ <select name="limit" class="input-small">
<option selected="selected">None</option>
<option>5</option>
<option>10</option>
@@ -69,89 +131,39 @@ the License.
<option>30</option>
<option>50</option>
<option>100</option>
- <option>500</option>
- </select>
- </label>
- </div>
- <div class="span6">
- <label for="skipRows" class="inline drop-down">
- # of rows to skip
- <input name="skip" class="input-small" type="text" id="skipRows" placeholder="0">
- </label>
- </div>
- </div>
- <div class="row-fluid">
- <div class="span6">
- <label id="select2" class="drop-down inline">
- Order:
- <select id="select2" name="descending" class="input-medium">
- <option value="false">Ascending</option>
- <option value="true">Descending</option>
- </select>
- </label>
- </div>
- <div class="span6">
- <label id="select2" class="drop-down inline">
- Docs:
- <select id="select2" name="include_docs" class="input-medium">
- <option value="false">Exclude</option>
- <option value="true">Include</option>
+ <option>500</option>
</select>
</label>
</div>
- </div>
- <div class="row-fluid">
- <% if (showStale) { %>
- <div class="span6">
- <div class="checkbox inline">
- <input id="check7" name="stale" type="checkbox" value="ok">
- <label for="check7">Stale</label>
- </div>
- </div>
- <% } %>
- <div class="span6 update-seq">
- <div class="checkbox inline">
- <input id="check6" name="update_seq" type="checkbox" value="true">
- <label for="check6">Update Sequence</label>
- </div>
- </div>
</div>
- <% if (hasReduce) { %>
+
<div class="row-fluid">
- <div class="span6">
- <div class="checkbox inline">
- <input id="check2" name="reduce" type="checkbox" value="true">
- <label for="check2">Reduce</label>
- </div>
+ <div class="checkbox inline">
+ <input id="select2" name="descending" type="checkbox" value="true">
+ <label for="descending">Descending</label>
</div>
- <div class="span6">
- <label id="select1" class="drop-down inline">
- Group Level:
- <select id="select1" disabled name="group_level" class="input-small">
- <option value="0">None</option>
- <option value="1">1</option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
- <option value="5">5</option>
- <option value="6">6</option>
- <option value="7">7</option>
- <option value="8">8</option>
- <option value="9">9</option>
- <option value="999" selected="selected">Exact</option>
- </select>
+
+ <div class="dropdown inline">
+ <label for="skipRows" class="drop-down">
+ Skip
+ <input name="skip" class="input-small" type="text" id="skipRows" placeholder="# of rows">
</label>
</div>
</div>
- <% } %>
</div>
- <div class="controls-group">
+ <div class="controls-group query-group">
+ <span class="add-on">
+ Query the DB
+ </span>
<div id="button-options" class="controls controls-row">
- <button type="submit" class="btn btn-success">Query</button>
+ <button type="submit" class="btn btn-success">
+ <i class="fonticon-play icon"></i>
+ Query
+ </button>
</div>
</div>
+
</form>
-</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/templates/all_docs_item.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/all_docs_item.html b/app/addons/documents/templates/all_docs_item.html
index a8ef20f..4526df2 100644
--- a/app/addons/documents/templates/all_docs_item.html
+++ b/app/addons/documents/templates/all_docs_item.html
@@ -12,15 +12,21 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<td class="select"><input <%- checked ? 'checked="checked"' : '' %> type="checkbox" class="js-row-select"></td>
-<td>
- <div>
+<div class="select"><input <%- checked ? 'checked="checked"' : '' %> type="checkbox" class="js-row-select"></div>
+<div class="doc-item">
+
+ <header>
+ _id <span class="header-id-number">"<%=docID%>"</span>
+
+ <% if (doc.isEditable()) { %>
+ <div class="btn-group">
+ <a href="#<%= doc.url('web-index') %>" class="btn btn-small edits">Edit <%- doc.docType() %></a>
+ <button href="#" class="btn btn-small btn-danger delete" title="Delete this document."><i class="icon icon-trash"></i></button>
+ </div>
+ <% } %>
+ </header>
+ <div class="doc-data">
<pre class="prettyprint"><%- doc.prettyJSON() %></pre>
- <% if (doc.isEditable()) { %>
- <div class="btn-group">
- <a href="#<%= doc.url('web-index') %>" class="btn btn-small edits">Edit <%- doc.docType() %></a>
- <button href="#" class="btn btn-small btn-danger delete" title="Delete this document."><i class="icon icon-trash"></i></button>
- </div>
- <% } %>
</div>
-</td>
+</div>
+<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/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 a643427..d132eb2 100644
--- a/app/addons/documents/templates/all_docs_list.html
+++ b/app/addons/documents/templates/all_docs_list.html
@@ -29,9 +29,9 @@ the License.
<p>
<div id="item-numbers"> </div>
- <table class="all-docs table table-striped table-condensed">
- <tbody></tbody>
- </table>
+ <div id="doc-list">
+
+ </div>
<% if (endOfResults) { %>
<div class="text-center well">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/templates/design_doc_selector.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/design_doc_selector.html b/app/addons/documents/templates/design_doc_selector.html
deleted file mode 100644
index d12cd64..0000000
--- a/app/addons/documents/templates/design_doc_selector.html
+++ /dev/null
@@ -1,38 +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="span3">
- <label for="ddoc">Save to Design Document <a class="help-link" data-bypass="true" href="<%-getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
- <select id="ddoc">
- <optgroup label="Select a document">
- <option value="new-doc">New document</option>
-
- <% ddocs.each(function(ddoc) { %>
- <%= ddoc.id %>
- <%= ddocName %>
- <% if (ddoc.id === ddocName) { %>
- <option selected="selected" value="<%- ddoc.id %>"><%- ddoc.id %></option>
- <% } else { %>
- <option value="<%- ddoc.id %>"><%- ddoc.id %></option>
- <% } %>
- <% }); %>
- </optgroup>
- </select>
-</div>
-
-<div id="new-ddoc-section" class="span5" style="display:none">
- <label class="control-label" for="new-ddoc"> _design/ </label>
- <div class="controls">
- <input type="text" id="new-ddoc" placeholder="newDesignDoc" />
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/templates/header_alldocs.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/header_alldocs.html b/app/addons/documents/templates/header_alldocs.html
new file mode 100644
index 0000000..e37a2ae
--- /dev/null
+++ b/app/addons/documents/templates/header_alldocs.html
@@ -0,0 +1,36 @@
+<!--
+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="header-left">
+ BLOOP
+<!--back arrow-->
+
+<!--title with dropdown DB search-->
+
+
+<!-- Menu gear-->
+
+</div>
+
+
+<div class="header-right">
+ <!-- Select all -->
+
+ <!-- search (jump to doc)-->
+
+ <!-- Query Options-->
+
+
+ <!--right margin for api bar-->
+</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/templates/header_doc_edit.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/header_doc_edit.html b/app/addons/documents/templates/header_doc_edit.html
new file mode 100644
index 0000000..fbc213f
--- /dev/null
+++ b/app/addons/documents/templates/header_doc_edit.html
@@ -0,0 +1,33 @@
+<!--
+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="header-left">
+<!--back arrow-->
+
+<!--title with dropdown DB search-->
+
+<!-- Menu gear-->
+</div>
+
+
+<div class="header-right">
+<!-- Select button-->
+<!-- ? button-->
+<!-- ? button-->
+<!-- ? button-->
+<!-- ? button-->
+<!-- json button-->
+<!-- trash button-->
+<!-- cancel button-->
+</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/templates/index_menu_item.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/index_menu_item.html b/app/addons/documents/templates/index_menu_item.html
index 8519f42..42ff833 100644
--- a/app/addons/documents/templates/index_menu_item.html
+++ b/app/addons/documents/templates/index_menu_item.html
@@ -15,8 +15,8 @@ the License.
<div class="fonticon-play"></div>
<span class="<%- icon %> fonticon"></span>
<%- ddocType %>
- </a>
- <ul class="accordion-body collapse" id="<%- removeSpecialCharacters(ddoc) + ddocType %>">
+</a>
+<ul class="accordion-body collapse" id="<%- removeSpecialCharacters(ddoc) + ddocType %>">
<% _.each(collection, function (item, index) { %>
<li>
<a data-ddoctype="<%- ddocType %>" id="<%- removeSpecialCharacters(ddoc) %>_<%- removeSpecialCharacters(index) %>" href="#/database/<%- safeURL(database) %>/_design/<%= safeURL(ddoc)%>/_<%=ddocType%>/<%= safeURL(index) %>" class="toggle-view">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/templates/index_row_docular.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/index_row_docular.html b/app/addons/documents/templates/index_row_docular.html
deleted file mode 100644
index e8973ad..0000000
--- a/app/addons/documents/templates/index_row_docular.html
+++ /dev/null
@@ -1,29 +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.
--->
-<% if (doc.isEditable()) { %>
- <td class="select"><input type="checkbox"></td>
-<% } %>
-<td>
- <div>
- <pre class="prettyprint"><%- doc.prettyJSON() %></pre>
-
- <div class="btn-group">
- <a href="#<%= url %>" class="btn btn-small edits">Edit <%= doc.docType() %></a>
- <% if (doc.isEditable()) { %>
- <button href="#" class="btn btn-small btn-danger delete" title="Delete this document."><i class="icon icon-trash"></i></button>
- <% } %>
- </div>
-
- </div>
-</td>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/templates/index_row_tabular.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/index_row_tabular.html b/app/addons/documents/templates/index_row_tabular.html
deleted file mode 100644
index f5f68fa..0000000
--- a/app/addons/documents/templates/index_row_tabular.html
+++ /dev/null
@@ -1,25 +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.
--->
-
-<td class="select"><input type="checkbox"></td>
-<td>
- <div>
- <pre class="prettyprint"><%- JSON.stringify(doc.get("key")) %></pre>
- </div>
-</td>
-<td>
- <div>
- <pre class="prettyprint"><%- JSON.stringify(doc.get("value")) %></pre>
- </div>
-</td>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/views-index.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-index.js b/app/addons/documents/views-index.js
deleted file mode 100644
index d0ed8ed..0000000
--- a/app/addons/documents/views-index.js
+++ /dev/null
@@ -1,574 +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.
-
-define([
- "app",
-
- "api",
- "addons/fauxton/components",
-
- "addons/documents/resources",
- "addons/databases/resources",
- "addons/pouchdb/base",
- //views
- "addons/documents/views-advancedopts",
- // Libs
- "addons/fauxton/resizeColumns",
-
- // Plugins
- "plugins/beautify",
- "plugins/prettify"
-],
-
-function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
- QueryOptions, resizeColumns, beautify, prettify) {
-
- var Views = {};
-
- Views.ViewEditor = FauxtonAPI.View.extend({
- template: "addons/documents/templates/view_editor",
- builtinReduces: ['_sum', '_count', '_stats'],
-
- events: {
- "click button.save": "saveView",
- "click button.delete": "deleteView",
- "change select#reduce-function-selector": "updateReduce",
- "click button.preview": "previewView",
- "click #db-views-tabs-nav": 'toggleIndexNav',
- "click .beautify_map": "beautifyCode",
- "click .beautify_reduce": "beautifyCode",
- "click #query-options-wrapper": 'toggleIndexNav'
- },
-
- langTemplates: {
- "javascript": {
- map: "function(doc) {\n emit(doc._id, 1);\n}",
- reduce: "function(keys, values, rereduce){\n if (rereduce){\n return sum(values);\n } else {\n return values.length;\n }\n}"
- }
- },
-
- defaultLang: "javascript",
-
- initialize: function(options) {
- this.newView = options.newView || false;
- this.ddocs = options.ddocs;
- this.params = options.params;
- this.database = options.database;
- this.currentDdoc = options.currentddoc;
- if (this.newView) {
- this.viewName = 'newView';
- } else {
- this.ddocID = options.ddocInfo.id;
- this.viewName = options.viewName;
- this.ddocInfo = new Documents.DdocInfo({_id: this.ddocID},{database: this.database});
- }
-
- this.showIndex = false;
- _.bindAll(this);
- },
-
- establish: function () {
- if (this.ddocInfo) {
- return this.ddocInfo.fetch();
- }
- },
-
- updateValues: function() {
- var notification;
- if (this.model.changedAttributes()) {
- notification = FauxtonAPI.addNotification({
- msg: "Document saved successfully.",
- type: "success",
- clear: true
- });
- this.editor.setValue(this.model.prettyJSON());
- }
- },
-
- updateReduce: function(event) {
- var $ele = $("#reduce-function-selector");
- var $reduceContainer = $(".control-group.reduce-function");
- if ($ele.val() == "CUSTOM") {
- this.createReduceEditor();
- this.reduceEditor.setValue(this.langTemplates.javascript.reduce);
- $reduceContainer.show();
- } else {
- $reduceContainer.hide();
- }
- },
-
- deleteView: function (event) {
- event.preventDefault();
-
- if (this.newView) { return alert('Cannot delete a new view.'); }
- if (!confirm('Are you sure you want to delete this view?')) {return;}
-
- var that = this,
- promise,
- viewName = this.$('#index-name').val(),
- ddocName = this.$('#ddoc :selected').val(),
- ddoc = this.getCurrentDesignDoc();
-
- ddoc.removeDdocView(viewName);
-
- if (ddoc.hasViews()) {
- promise = ddoc.save();
- } else {
- promise = ddoc.destroy();
- }
-
- promise.then(function () {
- FauxtonAPI.navigate('/database/' + that.database.safeID() + '/_all_docs?limit=' + Databases.DocLimit);
- FauxtonAPI.triggerRouteEvent('reloadDesignDocs');
- });
- },
-
- saveView: function(event) {
- var json, notification,
- that = this;
-
- if (event) { event.preventDefault();}
-
- $('#dashboard-content').scrollTop(0); //scroll up
-
- if (this.hasValidCode() && this.$('#new-ddoc:visible').val() !=="") {
- var mapVal = this.mapEditor.getValue(),
- reduceVal = this.reduceVal(),
- viewName = this.$('#index-name').val(),
- ddoc = this.getCurrentDesignDoc(),
- ddocName = ddoc.id,
- viewNameChange = false;
-
- if (this.viewName !== viewName) {
- ddoc.removeDdocView(this.viewName);
- this.viewName = viewName;
- viewNameChange = true;
- }
-
- notification = FauxtonAPI.addNotification({
- msg: "Saving document.",
- selector: "#define-view .errors-container",
- clear: true
- });
-
- ddoc.setDdocView(viewName, mapVal, reduceVal);
-
- ddoc.save().then(function () {
- that.ddocs.add(ddoc);
-
- that.mapEditor.editSaved();
- that.reduceEditor && that.reduceEditor.editSaved();
-
-
- FauxtonAPI.addNotification({
- msg: "View has been saved.",
- type: "success",
- selector: "#define-view .errors-container",
- clear: true
- });
-
- if (that.newView || viewNameChange) {
- var fragment = '/database/' + that.database.safeID() +'/' + ddoc.safeID() + '/_view/' + app.utils.safeURLName(viewName);
-
- FauxtonAPI.navigate(fragment, {trigger: false});
- that.newView = false;
- that.ddocID = ddoc.safeID();
- that.viewName = viewName;
- that.ddocInfo = ddoc;
- that.showIndex = true;
- that.render();
- FauxtonAPI.triggerRouteEvent('reloadDesignDocs', {
- selectedTab: app.utils.removeSpecialCharacters(ddocName.replace(/_design\//,'')) + '_' + app.utils.removeSpecialCharacters(viewName)
- });
- }
-
- if (that.reduceFunStr !== reduceVal) {
- that.reduceFunStr = reduceVal;
- that.advancedOptions.renderOnUpdatehasReduce(that.hasReduce());
- }
-
- FauxtonAPI.triggerRouteEvent('updateAllDocs', {ddoc: ddocName, view: viewName});
-
- }, function(xhr) {
- var responseText = JSON.parse(xhr.responseText).reason;
- notification = FauxtonAPI.addNotification({
- msg: "Save failed: " + responseText,
- type: "error",
- clear: true
- });
- });
- } else {
- var errormessage = (this.$('#new-ddoc:visible').val() ==="")?"Enter a design doc name":"Please fix the Javascript errors and try again.";
- notification = FauxtonAPI.addNotification({
- msg: errormessage,
- type: "error",
- selector: "#define-view .errors-container",
- clear: true
- });
- }
- },
-
- updateView: function(event, paramInfo) {
- event.preventDefault();
-
- if (this.newView) { return alert('Please save this new view before querying it.'); }
-
- var errorParams = paramInfo.errorParams,
- params = paramInfo.params;
-
- if (_.any(errorParams)) {
- _.map(errorParams, function(param) {
-
- // TODO: Where to add this error?
- // bootstrap wants the error on a control-group div, but we're not using that
- //$('form.view-query-update input[name='+param+'], form.view-query-update select[name='+param+']').addClass('error');
- return FauxtonAPI.addNotification({
- msg: "JSON Parse Error on field: "+param.name,
- type: "error",
- selector: ".advanced-options .errors-container",
- clear: true
- });
- });
- FauxtonAPI.addNotification({
- msg: "Make sure that strings are properly quoted and any other values are valid JSON structures",
- type: "warning",
- selector: ".advanced-options .errors-container",
- clear: true
- });
-
- return false;
- }
-
- var fragment = window.location.hash.replace(/\?.*$/, '');
- if (!_.isEmpty(params)) {
- fragment = fragment + '?' + $.param(params);
- }
-
- FauxtonAPI.navigate(fragment, {trigger: false});
- FauxtonAPI.triggerRouteEvent('updateAllDocs', {ddoc: this.ddocID, view: this.viewName});
- },
-
-
- previewView: function(event, paramsInfo) {
- event.preventDefault();
- var that = this,
- mapVal = this.mapVal(),
- reduceVal = this.reduceVal(),
- paramsArr = [];
-
- if (paramsInfo && paramsInfo.params) {
- paramsArr = paramsInfo.params;
- }
-
- var params = _.reduce(paramsArr, function (params, param) {
- params[param.name] = param.value;
- return params;
- }, {reduce: false});
-
- FauxtonAPI.addNotification({
- msg: "<strong>Warning!</strong> Preview executes the Map/Reduce functions in your browser, and may behave differently from CouchDB.",
- type: "warning",
- selector: ".advanced-options .errors-container",
- fade: true,
- escape: false // beware of possible XSS when the message changes
- });
-
- var promise = FauxtonAPI.Deferred();
-
- if (!this.database.allDocs || this.database.allDocs.params.include_docs !== true) {
- this.database.buildAllDocs({limit: Databases.DocLimit.toString(), include_docs: true});
- promise = this.database.allDocs.fetch();
- } else {
- promise.resolve();
- }
-
- promise.then(function () {
- params.docs = that.database.allDocs.map(function (model) { return model.get('doc');});
- var queryPromise = pouchdb.runViewQuery({map: mapVal, reduce: reduceVal}, params);
- queryPromise.then(function (results) {
- FauxtonAPI.triggerRouteEvent('updatePreviewDocs', {rows: results.rows, ddoc: that.getCurrentDesignDoc().id, view: that.viewName});
- });
- });
- },
-
- getCurrentDesignDoc: function () {
- return this.designDocSelector.getCurrentDesignDoc();
- },
-
- isCustomReduceEnabled: function() {
- return $("#reduce-function-selector").val() == "CUSTOM";
- },
-
- mapVal: function () {
- if (this.mapEditor) {
- return this.mapEditor.getValue();
- }
-
- return this.$('#map-function').text();
- },
-
- reduceVal: function() {
- var reduceOption = this.$('#reduce-function-selector :selected').val(),
- reduceVal = "";
-
- if (reduceOption === 'CUSTOM') {
- if (!this.reduceEditor) { this.createReduceEditor(); }
- reduceVal = this.reduceEditor.getValue();
- } else if ( reduceOption !== 'NONE') {
- reduceVal = reduceOption;
- }
-
- return reduceVal;
- },
-
-
- hasValidCode: function() {
- return _.every(["mapEditor", "reduceEditor"], function(editorName) {
- var editor = this[editorName];
- if (editorName === "reduceEditor" && ! this.isCustomReduceEnabled()) {
- return true;
- }
- return editor.hadValidCode();
- }, this);
- },
-
- toggleIndexNav: function (event) {
- $('#dashboard-content').scrollTop(0); //scroll up
-
- var $targetId = this.$(event.target).attr('id'),
- $previousTab = this.$(this.$('li.active a').attr('href')),
- $targetTab = this.$(this.$(event.target).attr('href'));
-
- if ($targetTab.attr('id') !== $previousTab.attr('id')) {
- $previousTab.removeAttr('style');
- }
-
- if ($targetId === 'index-nav') {
- if (this.newView) { return; }
- var that = this;
- $('#dashboard-content').scrollTop(0); //scroll up
- $targetTab.toggle('slow', function(){
- that.showEditors();
- });
- } else {
- $targetTab.toggle('slow');
- }
- },
-
- serialize: function() {
- return {
- ddocs: this.ddocs,
- ddoc: this.model,
- ddocName: this.model.id,
- viewName: this.viewName,
- reduceFunStr: this.reduceFunStr,
- isCustomReduce: this.hasCustomReduce(),
- newView: this.newView,
- langTemplates: this.langTemplates.javascript
- };
- },
-
- hasCustomReduce: function() {
- return this.reduceFunStr && ! _.contains(this.builtinReduces, this.reduceFunStr);
- },
-
- hasReduce: function () {
- return this.reduceFunStr || false;
- },
-
- createReduceEditor: function () {
- if (this.reduceEditor) {
- this.reduceEditor.remove();
- }
-
- this.reduceEditor = new Components.Editor({
- editorId: "reduce-function",
- mode: "javascript",
- couchJSHINT: true
- });
- this.reduceEditor.render();
-
- if (this.reduceEditor.getLines() === 1){
- this.$('.beautify_reduce').removeClass("hide");
- $('.beautify-tooltip').tooltip();
- }
- },
- beforeRender: function () {
-
- if (this.newView) {
- this.reduceFunStr = '';
- if (this.ddocs.length === 0) {
- this.model = new Documents.Doc(null, {database: this.database});
- } else {
- this.model = this.ddocs.first().dDocModel();
- }
- this.ddocID = this.model.id;
- } else {
- var ddocDecode = decodeURIComponent(this.ddocID);
- this.model = this.ddocs.get(this.ddocID).dDocModel();
- this.reduceFunStr = this.model.viewHasReduce(this.viewName);
- }
-
- var viewFilters = FauxtonAPI.getExtensions('sidebar:viewFilters'),
- filteredModels = this.ddocs.models,
- designDocs = this.ddocs.clone();
-
- if (!_.isEmpty(viewFilters)) {
- _.each(viewFilters, function (filter) {
- filteredModels = _.filter(filteredModels, filter);
- });
- designDocs.reset(filteredModels, {silent: true});
- }
-
- this.designDocSelector = this.setView('.design-doc-group', new Views.DesignDocSelector({
- collection: designDocs,
- ddocName: this.currentDdoc || this.model.id,
- database: this.database
- }));
-
- if (!this.newView) {
- this.eventer = _.extend({}, Backbone.Events);
-
- this.advancedOptions = this.insertView('#query', new QueryOptions.AdvancedOptions({
- updateViewFn: this.updateView,
- previewFn: this.previewView,
- database: this.database,
- viewName: this.viewName,
- ddocName: this.model.id,
- hasReduce: this.hasReduce(),
- eventer: this.eventer,
- showStale: true
- }));
- }
-
- },
-
- afterRender: function() {
-
- if (this.params && !this.newView) {
- this.advancedOptions.updateFromParams(this.params);
- }
-
- this.designDocSelector.updateDesignDoc();
- if (this.newView || this.showIndex) {
- this.showEditors();
- this.showIndex = false;
- } else {
- this.$('#index').hide();
- this.$('#index-nav').parent().removeClass('active');
- }
-
- },
-
- showEditors: function () {
- this.mapEditor = new Components.Editor({
- editorId: "map-function",
- mode: "javascript",
- couchJSHINT: true
- });
- this.mapEditor.render();
-
- if (this.hasCustomReduce()) {
- this.createReduceEditor();
- } else {
- $(".control-group.reduce-function").hide();
- }
-
- if (this.newView) {
- this.mapEditor.setValue(this.langTemplates[this.defaultLang].map);
- //Use a built in view by default
- //this.reduceEditor.setValue(this.langTemplates[this.defaultLang].reduce);
- }
-
- this.mapEditor.editSaved();
- this.reduceEditor && this.reduceEditor.editSaved();
-
- if (this.mapEditor.getLines() === 1){
- this.$('.beautify_map').removeClass("hide");
- $('.beautify-tooltip').tooltip();
- }
- },
- beautifyCode: function(e){
- e.preventDefault();
- var targetEditor = $(e.currentTarget).hasClass('beautify_reduce')?this.reduceEditor:this.mapEditor;
- var beautifiedCode = beautify(targetEditor.getValue());
- targetEditor.setValue(beautifiedCode);
- },
- cleanup: function () {
- this.mapEditor && this.mapEditor.remove();
- this.reduceEditor && this.reduceEditor.remove();
- }
- });
-
- Views.DesignDocSelector = FauxtonAPI.View.extend({
- template: "addons/documents/templates/design_doc_selector",
-
- events: {
- "change select#ddoc": "updateDesignDoc"
- },
-
- initialize: function (options) {
- this.ddocName = options.ddocName;
- this.database = options.database;
- this.listenTo(this.collection, 'add', this.ddocAdded);
- this.DocModel = options.DocModel || Documents.Doc;
- },
-
- ddocAdded: function (ddoc) {
- this.ddocName = ddoc.id;
- this.render();
- },
-
- serialize: function () {
- return {
- ddocName: this.ddocName,
- ddocs: this.collection
- };
- },
-
- updateDesignDoc: function () {
- if (this.newDesignDoc()) {
- this.$('#new-ddoc-section').show();
- } else {
- this.$('#new-ddoc-section').hide();
- }
- },
-
- newDesignDoc: function () {
-
- return this.$('#ddoc').val() === 'new-doc';
- },
-
- newDocValidation: function(){
- return this.newDesignDoc() && this.$('#new-ddoc').val()==="";
- },
- getCurrentDesignDoc: function () {
- if (this.newDesignDoc()) {
- var doc = {
- _id: '_design/' + this.$('#new-ddoc').val(),
- views: {},
- language: "javascript"
- };
- var ddoc = new this.DocModel(doc, {database: this.database});
- //this.collection.add(ddoc);
- return ddoc;
- } else if ( !this.newDesignDoc() ) {
- var ddocName = this.$('#ddoc').val();
- return this.collection.find(function (ddoc) {
- return ddoc.id === ddocName;
- }).dDocModel();
- }
- }
- });
-
- return Views;
-});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/views-sidebar.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-sidebar.js b/app/addons/documents/views-sidebar.js
index 8699417..7ebe99a 100644
--- a/app/addons/documents/views-sidebar.js
+++ b/app/addons/documents/views-sidebar.js
@@ -137,16 +137,22 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
toggleArrow: function(e){
this.$(e.currentTarget).toggleClass("down");
},
- buildIndexList: function(collection, selector, ddocType){
+ buildIndexList: function(collection, indexType){
var design = this.model.id.replace(/^_design\//,"");
-
- this.insertView(".accordion-body", new Views.IndexItem({
- selector: selector,
- ddoc: design,
- collection: collection[selector],
- ddocType: ddocType,
- database: this.model.collection.database.id
- }));
+ var selector = indexType.selector;
+ var ddocType = indexType.ddocType;
+ var icon = indexType.icon;
+
+ if (collection[selector]){
+ this.insertView(".accordion-body", new Views.IndexItem({
+ selector: selector,
+ ddoc: design,
+ collection: collection[selector],
+ ddocType: ddocType,
+ database: this.model.collection.database.id,
+ icon: icon
+ }));
+ }
},
serialize: function(){
@@ -162,23 +168,19 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
getSidebarLinks: function () {
var ddocName = this.model.id.replace(/^_design\//,""),
- docSafe = app.utils.safeURLName(ddocName),
+ docSafe = app.utils.safeURLName(ddocName),
database = this.collection.database;
return _.reduce(FauxtonAPI.getExtensions('sidebar:links'), function (menuLinks, link) {
menuLinks.push({
title: link.title,
- url: "#" + database.url('app') + "/" + link.url + "/" + docSafe,
+ url: "#" + database.url('app') + "/_design/" + docSafe + "/" + link.url,
icon: 'fonticon-plus-circled'
});
- return menuLinks;
- }, [{
- title: 'Secondary View',
- url: "#" + database.url('app') + "/new_view/" + docSafe,
- icon: 'fonticon-plus-circled'
- }]);
+ return menuLinks;
+ }, []);
},
@@ -188,9 +190,9 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
if (!ddocDocs){ return; }
- this.buildIndexList(ddocDocs, "views", "view");
- _.each(sidebarListTypes, function (type) {
- this.buildIndexList(ddocDocs, type);
+ //this.buildIndexList(ddocDocs, "views", "view");
+ _.each(sidebarListTypes, function (listType) {
+ this.buildIndexList(ddocDocs, listType);
},this);
},
@@ -210,6 +212,7 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
}
});
+ //Sidebar Index Item
Views.IndexItem = FauxtonAPI.View.extend({
template: "addons/documents/templates/index_menu_item",
tagName: 'li',
@@ -221,16 +224,13 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
this.selected = !! options.selected;
this.selector = options.selector;
this.ddocType = options.ddocType || this.selector;
- this.icons = {
- "view": "fonticon-sidenav-map-reduce",
- "indexes": "fonticon-sidenav-search"
- };
+ this.icon = options.icon;
},
serialize: function() {
return {
- icon: this.icons[this.ddocType],
+ icon: this.icon,
ddocType: this.ddocType,
index: this.index,
ddoc: this.ddoc,
@@ -239,7 +239,6 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
collection: this.collection
};
},
-
afterRender: function() {
if (this.selected) {
$(".sidenav ul.nav-list li").removeClass("active");
@@ -248,6 +247,8 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
}
});
+
+
return Views;
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index b68df87..8f02867 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -38,6 +38,75 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
});
}
+ //Header for alldocs with search, back, Menu, Query options, select etc
+ Views.AllDocsHeader = FauxtonAPI.View.extend({
+ template: "addons/documents/templates/header_alldocs",
+ events: {
+ 'select .selectAllDocs': 'selectAllDocs'
+ },
+ initialize: function(options){
+
+ },
+ selectAllDocs: function(){
+ //trigger event to select all in other view
+ },
+ afterRender:function(){
+ //insert DB search dropdown
+
+ //insert top create level dropdown with gear icon
+
+ //search docs
+
+ //insert queryoptions
+
+ }
+ });
+
+
+ //header that shows up when a doc is selected
+ // when a Doc is selected, trigger a routeEvent to render this
+ // the routeEvent will determine which header to show (??)
+ Views.DocEditHeader = FauxtonAPI.View.extend({
+ template: "addons/documents/templates/header_doc_edit",
+ events: {
+ 'select .selectAllDocs': 'selectAllDocs'
+ },
+ initialize: function(options){
+
+ },
+ selectAllDocs: function(){
+ //trigger event to select all in other view
+ },
+ afterRender:function(){
+ //insert DB search dropdown
+
+ //insert top create level dropdown with gear icon
+ }
+ });
+
+ Views.DocsHeader = FauxtonAPI.View.extend({
+ template: "addons/documents/templates/header_selecteddoc",
+ events: {
+ 'select .selectAllDocs': 'selectAllDocs'
+ },
+ initialize: function(options){
+
+ },
+ selectAllDocs: function(){
+ //trigger event to select all in other view
+ },
+ afterRender:function(){
+ //insert DB search dropdown
+
+ //insert top create level dropdown with gear icon
+
+ //search docs
+
+ //insert queryoptions
+
+ }
+ });
+
Views.DeleteDBModal = Components.ModalView.extend({
template: "addons/documents/templates/delete_database_modal",
@@ -83,9 +152,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
Views.Document = FauxtonAPI.View.extend({
template: "addons/documents/templates/all_docs_item",
- tagName: "tr",
- className: "all-docs-item",
-
+ className: "all-docs-item doc-row",
initialize: function (options) {
this.checked = options.checked;
},
@@ -103,6 +170,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
serialize: function() {
return {
+ docID: this.model.get('_id'),
doc: this.model,
checked: this.checked
};
@@ -148,27 +216,6 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
}
});
- Views.Row = FauxtonAPI.View.extend({
- template: "addons/documents/templates/index_row_docular",
- tagName: "tr",
-
- events: {
- "click button.delete": "destroy"
- },
-
- destroy: function (event) {
- event.preventDefault();
-
- window.alert('Cannot delete a document generated from a view.');
- },
-
- serialize: function() {
- return {
- doc: this.model,
- url: this.model.url('app')
- };
- }
- });
Views.AllDocsNumber = FauxtonAPI.View.extend({
@@ -378,7 +425,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
},
toggleDocument: function (event) {
- var $row = this.$(event.target).closest('tr'),
+ var $row = this.$(event.target).closest('.doc-row'),
docId = $row.attr('data-id'),
db = this.database.get('id'),
rev = this.collection.get(docId).get('_rev'),
@@ -510,7 +557,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
if (this.bulkDeleteDocsCollection) {
isChecked = this.bulkDeleteDocsCollection.get(doc.id);
}
- this.rows[doc.id] = this.insertView("table.all-docs tbody", new this.nestedView({
+ this.rows[doc.id] = this.insertView("#doc-list", new this.nestedView({
model: doc,
checked: isChecked
}));
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index d77af4a..8ec5d01 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -450,7 +450,7 @@ function(app, FauxtonAPI, ace, spin) {
if (this.mode != "plain") {
this.editor.getSession().setMode("ace/mode/" + this.mode);
}
-
+
this.editor.setShowPrintMargin(false);
this.addCommands();
@@ -621,11 +621,12 @@ function(app, FauxtonAPI, ace, spin) {
className: "dropdown",
initialize: function(options){
this.links = options.links;
+ this.icon = options.icon || "fonticon-plus-circled2";
},
serialize: function(){
- var sidebarItem = FauxtonAPI.getExtensions('sidebar:links');
return {
- links: this.links
+ links: this.links,
+ icon: this.icon
};
}
});
@@ -634,7 +635,7 @@ function(app, FauxtonAPI, ace, spin) {
//need to make this into a backbone view...
var routeObjectSpinner;
FauxtonAPI.RouteObject.on('beforeEstablish', function (routeObject) {
- if (!routeObject.disableLoader){
+ if (!routeObject.disableLoader){
var opts = {
lines: 16, // The number of lines to draw
length: 8, // The length of each line
@@ -680,7 +681,7 @@ function(app, FauxtonAPI, ace, spin) {
FauxtonAPI.RouteObject.on('beforeRender', function (routeObject, view, selector) {
removeRouteObjectSpinner();
- if (!view.disableLoader){
+ if (!view.disableLoader){
var opts = {
lines: 16, // The number of lines to draw
length: 8, // The length of each line
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/fauxton/resizeColumns.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/resizeColumns.js b/app/addons/fauxton/resizeColumns.js
index b3d8841..0da3f45 100644
--- a/app/addons/fauxton/resizeColumns.js
+++ b/app/addons/fauxton/resizeColumns.js
@@ -32,7 +32,7 @@ function(FauxtonAPI) {
var primaryNavWidth = $('body').hasClass('closeMenu') ? 64 : 220;
return primaryNavWidth;
},
- getPanelWidth: function(){
+ getSinglePanelWidth: function(){
var sidebarWidth = $('#sidebar-content').length > 0 ? $('#sidebar-content').outerWidth() : 0,
borders = parseInt($('#dashboard').css('border-left-width'), 10) +
parseInt($('#dashboard-content').css('border-left-width'), 10) +
@@ -40,6 +40,14 @@ function(FauxtonAPI) {
return (this.getPrimaryNavWidth() + sidebarWidth + borders);
},
+ getTwoPanelWidth: function(){
+ var borders = parseInt($('#dashboard').css('border-left-width'), 10) +
+ parseInt($('#right-content').css('border-left-width'), 10) +
+ parseInt($('#left-content').css('border-right-width'), 10)+
+ parseInt($('#left-content').css('border-left-width'), 10) +
+ parseInt($('#right-content').css('border-right-width'), 10);
+ return (this.getPrimaryNavWidth()+ borders);
+ },
initialize: function(){
// $(window).off('resize');
var that = this;
@@ -59,23 +67,49 @@ function(FauxtonAPI) {
cleanupCallback: function(){
this.callback = null;
},
+ singlePanelResize: function(){
+ var combinedWidth = window.innerWidth - this.getSinglePanelWidth(),
+ smallWidthConstraint = ($('#sidebar-content').length > 0)? 470:800,
+ panelWidth;
+
+ if (combinedWidth > smallWidthConstraint) {
+ panelWidth = combinedWidth;
+ } else if (combinedWidth < smallWidthConstraint){
+ panelWidth = smallWidthConstraint;
+ }
+ return panelWidth;
+ },
+
+ getPanelWidth: function(){
+ var panelWidth;
+ if ($('#dashboard').hasClass('two-pane')){
+ panelWidth = (window.innerWidth - this.getTwoPanelWidth())/2;
+ } else {
+ panelWidth = this.singlePanelResize();
+ }
+ return panelWidth;
+ },
+
+ setPosition: function(panelWidth){
+ var primary = this.getPrimaryNavWidth();
+ $('#right-content').css('left',panelWidth+primary);
+ },
+
onResizeHandler: function (){
//if there is an override, do that instead
if (this.options.onResizeHandler){
this.options.onResizeHandler();
} else {
- var combinedWidth = window.innerWidth - this.getPanelWidth(),
- smallWidthConstraint = ($('#sidebar-content').length > 0)? 470:800,
- panelWidth;
-
- if (combinedWidth > smallWidthConstraint) {
- panelWidth = window.innerWidth - this.getPanelWidth();
- } else if (combinedWidth < smallWidthConstraint){
- panelWidth = smallWidthConstraint;
- }
+ /*
+ Just so we all are aware:
+ This entire file and the html of the layouts is bonkers
+ crazy. I hate what horrible things happened in this file.
+ It will change soon with a layout overhaul.
+ */
+ var panelWidth = this.getPanelWidth();
+ this.setPosition(panelWidth);
$('.window-resizeable').innerWidth(panelWidth);
-
}
//if there is a callback, run that
if(this.options.callback) {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/fauxton/templates/menu_dropdown.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/menu_dropdown.html b/app/addons/fauxton/templates/menu_dropdown.html
index ddef343..d1e96af 100644
--- a/app/addons/fauxton/templates/menu_dropdown.html
+++ b/app/addons/fauxton/templates/menu_dropdown.html
@@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<a class="dropdown-toggle icon fonticon-plus-circled2" data-toggle="dropdown" href="#" data-bypass="true"></a>
+<a class="dropdown-toggle icon <%=icon%>" data-toggle="dropdown" href="#" data-bypass="true"></a>
<ul class="dropdown-menu arrow" role="menu" aria-labelledby="dLabel">
<% _.each(links, function (linkSection) { %>
<% if (linkSection.title) { %>
@@ -20,9 +20,9 @@ the License.
<% } %>
<% _.each(linkSection.links, function (link) { %>
<li>
- <a
+ <a
<% if (link.icon) { %>
- class="icon <%- link.icon %>"
+ class="icon <%- link.icon %>"
<% } %>
href="<%- link.url %>">
<%- link.title %>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/assets/less/doc-item.less
----------------------------------------------------------------------
diff --git a/app/addons/indexes/assets/less/doc-item.less b/app/addons/indexes/assets/less/doc-item.less
new file mode 100644
index 0000000..a04883a
--- /dev/null
+++ b/app/addons/indexes/assets/less/doc-item.less
@@ -0,0 +1,83 @@
+// 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.
+.view table td div.doc-menu-item div.dropdown{
+ display: block;
+}
+
+#doc-list{
+ margin-top: 30px;
+ div.doc-row {
+ margin-bottom:20px;
+ div.select {
+ width: 10%;
+ float: left;
+ vertical-align: top;
+ }
+ .doc-item {
+ float:left;
+ width:90%;
+ vertical-align: top;
+ position: relative;
+ .border-radius(5px 5px 5px 5px);
+ .box-shadow(3px 4px 0 rgba(0, 0, 0, 0.3));
+ border: 1px solid #000;
+ header {
+ font-weight: bold;
+ position: relative;
+ padding: 20px;
+ background-color: #777;
+ color: #3a2c2b;
+ border-bottom: 1px solid #000;
+ .header-id-number{
+ color: #fff;
+ margin-left: 10px;
+ }
+ }
+
+ .doc-data{
+ pre.prettyprint{
+ }
+ }
+
+ &:hover{
+ .btn-group{
+ display:block;
+ }
+ }
+ //temporary
+ .btn-group{
+ position:absolute;
+ top:10px;
+ right:10px;
+ display:none;
+ }
+
+ .doc-menu {
+ position:absolute;
+ right: 0px;
+ top: 0px;
+ .doc-menu-item{
+ a {
+ text-decoration: none;
+ }
+ .dropdown-menu {
+ left:auto;
+ right: 0px;
+ }
+ display: inline-block;
+ width: 30px;
+ height: 30px;
+ }
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/assets/less/index-form.less
----------------------------------------------------------------------
diff --git a/app/addons/indexes/assets/less/index-form.less b/app/addons/indexes/assets/less/index-form.less
new file mode 100644
index 0000000..09826e3
--- /dev/null
+++ b/app/addons/indexes/assets/less/index-form.less
@@ -0,0 +1,27 @@
+// 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.
+.index-form{
+ .control-group {
+ padding:15px 25px;
+ border-bottom: 1px solid #D9D9D9;
+ border-top: 1px solid #fff;
+ margin: 0 0 0 1px;
+ }
+ input[type=text]{
+ width: 100%;
+ .border-radius(5px 5px 5px 5px);
+ }
+ .js-editor {
+ border: 1px solid #ccc;
+ .border-radius(5px 5px 5px 5px);
+ }
+}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/assets/less/indexes.less
----------------------------------------------------------------------
diff --git a/app/addons/indexes/assets/less/indexes.less b/app/addons/indexes/assets/less/indexes.less
new file mode 100644
index 0000000..5795cce
--- /dev/null
+++ b/app/addons/indexes/assets/less/indexes.less
@@ -0,0 +1,17 @@
+// 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.
+@import "../../../../../assets/less/variables.less";
+@import "../../../../../assets/less/bootstrap/variables.less";
+@import "../../../../../assets/less/bootstrap/mixins.less";
+@import "new-index-placeholder.less";
+@import "index-form.less";
+@import "doc-item.less";
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/assets/less/new-index-placeholder.less
----------------------------------------------------------------------
diff --git a/app/addons/indexes/assets/less/new-index-placeholder.less b/app/addons/indexes/assets/less/new-index-placeholder.less
new file mode 100644
index 0000000..6336771
--- /dev/null
+++ b/app/addons/indexes/assets/less/new-index-placeholder.less
@@ -0,0 +1,25 @@
+// 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.
+.watermark-logo {
+ background: transparent url('../img/couchWatermark.png') no-repeat 50% 50%;
+ min-height: 400px;
+ padding-top: 80%;
+ text-align: center;
+ h3 {
+ border-bottom: 1px solid #ccc;
+ padding-bottom:10px;
+ margin-bottom:20px;
+ }
+ .preview {
+ margin: 0 10px;
+ }
+}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/base.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/base.js b/app/addons/indexes/base.js
new file mode 100644
index 0000000..6365c61
--- /dev/null
+++ b/app/addons/indexes/base.js
@@ -0,0 +1,74 @@
+// 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.
+
+
+/* View Indexes */
+define([
+ "app",
+ "api",
+ "addons/indexes/routes"
+],
+function(app, FauxtonAPI, Routes) {
+ Routes.initialize = function() {
+
+ /*
+ Example of an extension:
+ An extension is just like an event that may or may not have listener in another view.
+ In this case the listener is in the documents addon in the sidebar.
+
+ If there are is a view that you want rendered in another route, this is the way to do it.
+
+ Each Secondary index is going to trigger this event with the views it's passing.
+ The views will be rendered and have links to the routes defined in this addon. Then it's just business as usual.
+
+ FauxtonAPI.registerExtension('sidebar:list', new Views.IndexMenu({}));
+ FauxtonAPI.registerExtension('sidebar:links',{
+ title: "New View",
+ url: "new_view"
+ });
+
+
+ */
+ //Show in the sidebar
+ FauxtonAPI.registerExtension('sidebar:list', {
+ selector:'views',
+ ddocType:'view',
+ icon: "fonticon-sidenav-map-reduce"
+ });
+ FauxtonAPI.registerExtension('sidebar:list', {
+ selector:'list',
+ icon: "fonticon-sidenav-list-function"
+ });
+ FauxtonAPI.registerExtension('sidebar:list', {
+ selector:'show',
+ icon: "fonticon-sidenav-show-function"
+ });
+
+
+ /* show in the add new menu dropdown */
+ FauxtonAPI.registerExtension('sidebar:links', {
+ title: "Secondary View",
+ url: "new_view"
+ });
+ FauxtonAPI.registerExtension('sidebar:links', {
+ title: "List Function",
+ url: "new_list"
+ });
+
+ FauxtonAPI.registerExtension('sidebar:links', {
+ url: 'new_show',
+ title: 'Show Index'
+ });
+
+ };
+ return Routes;
+});
[8/9] buncha editor stuff making the preview page look less butts.
Styling the view form documents This stuff can't be tables. Boo. less for
indexes resize stuff And more refactor stuff View editor updates,
Splitting out less files An absolute abortion h
Posted by de...@apache.org.
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/index-components.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/index-components.js b/app/addons/indexes/index-components.js
new file mode 100644
index 0000000..1ec34e2
--- /dev/null
+++ b/app/addons/indexes/index-components.js
@@ -0,0 +1,30 @@
+// 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.
+
+
+/*
+ Index components includes any common, generic, and reusable code for creating secondary indexes
+ View functions, List functions, Show Functions, and Filter functions, as well as anything created by
+ couchdb affiliates.
+*/
+
+define([
+ "app",
+ "api"
+],
+
+function(app, FauxtonAPI) {
+ var Components = {};
+
+
+ return Components;
+});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/resources.js b/app/addons/indexes/resources.js
new file mode 100644
index 0000000..626d984
--- /dev/null
+++ b/app/addons/indexes/resources.js
@@ -0,0 +1,285 @@
+// 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.
+define([
+ "app",
+ "api",
+ "cloudant.pagingcollection"
+],
+
+function(app, FauxtonAPI, PagingCollection) {
+ var Resources = {};
+
+
+ Resources.QueryParams = (function () {
+ var _eachParams = function (params, action) {
+ // clone to avoid in-place modification
+ var result = _.clone(params);
+
+ _.each(['startkey', 'endkey', 'key'], function (key) {
+ if (_.has(result, key)) {
+ result[key] = action(result[key]);
+ }
+ });
+
+ return result;
+ };
+
+ return {
+ parse: function (params) {
+ return _eachParams(params, JSON.parse);
+ },
+
+ stringify: function (params) {
+ return _eachParams(params, JSON.stringify);
+ }
+ };
+ })();
+
+ Resources.ViewRow = FauxtonAPI.Model.extend({
+ // this is a hack so that backbone.collections doesn't group
+ // these by id and reduce the number of items returned.
+ idAttribute: "_id",
+
+ docType: function() {
+ if (!this.id) return "reduction";
+
+ return this.id.match(/^_design/) ? "design doc" : "doc";
+ },
+ documentation: function(){
+ return "docs";
+ },
+ url: function(context) {
+ return this.collection.database.url(context) + "/" + this.safeID();
+ },
+
+ isEditable: function() {
+ return this.docType() != "reduction";
+ },
+ safeID: function() {
+ var id = this.id || this.get("id");
+
+ return app.utils.safeURLName(id);
+ },
+
+ prettyJSON: function() {
+ //var data = this.get("doc") ? this.get("doc") : this;
+ return JSON.stringify(this, null, " ");
+ }
+ });
+
+
+ Resources.PouchIndexCollection = PagingCollection.extend({
+ model: Resources.ViewRow,
+ documentation: function(){
+ return "docs";
+ },
+ initialize: function(_models, options) {
+ this.database = options.database;
+ this.rows = options.rows;
+ this.view = options.view;
+ this.design = options.design.replace('_design/','');
+ this.params = _.extend({limit: 20, reduce: false}, options.params);
+
+ this.idxType = "_view";
+ },
+
+ url: function () {
+ return '';
+ },
+
+ simple: function () {
+ var docs = this.map(function (item) {
+ return {
+ _id: item.id,
+ key: item.get('key'),
+ value: item.get('value')
+ };
+ });
+
+ return new Resources.PouchIndexCollection(docs, {
+ database: this.database,
+ params: this.params,
+ view: this.view,
+ design: this.design,
+ rows: this.rows
+ });
+
+ },
+
+ fetch: function() {
+ var deferred = FauxtonAPI.Deferred();
+ this.reset(this.rows, {silent: true});
+
+ this.viewMeta = {
+ total_rows: this.rows.length,
+ offset: 0,
+ update_seq: false
+ };
+
+ deferred.resolve();
+ return deferred;
+ },
+
+ totalRows: function() {
+ return this.viewMeta.total_rows || "unknown";
+ },
+
+ updateSeq: function() {
+ return this.viewMeta.update_seq || false;
+ },
+
+ buildAllDocs: function(){
+ this.fetch();
+ },
+
+ allDocs: function(){
+ return this.models;
+ }
+ });
+
+
+ Resources.IndexCollection = PagingCollection.extend({
+ model: Resources.ViewRow,
+ documentation: function(){
+ return "docs";
+ },
+ initialize: function(_models, options) {
+ this.database = options.database;
+ this.params = _.extend({limit: 20, reduce: false}, options.params);
+
+ this.idxType = "_view";
+ this.view = options.view;
+ this.design = options.design.replace('_design/','');
+ this.perPageLimit = options.perPageLimit || 20;
+
+ if (!this.params.limit) {
+ this.params.limit = this.perPageLimit;
+ }
+ },
+
+ urlRef: function(context, params) {
+ var query = "";
+
+ if (params) {
+ if (!_.isEmpty(params)) {
+ query = "?" + $.param(params);
+ } else {
+ query = '';
+ }
+ } else if (this.params) {
+ var parsedParam = Resources.QueryParams.stringify(this.params);
+ query = "?" + $.param(parsedParam);
+ }
+
+ var startOfUrl = app.host;
+ if (context === 'app') {
+ startOfUrl = 'database';
+ } else if (context === "apiurl"){
+ startOfUrl = window.location.origin;
+ }
+ var design = app.utils.safeURLName(this.design),
+ view = app.utils.safeURLName(this.view);
+
+ var url = [startOfUrl, this.database.safeID(), "_design", design, this.idxType, view];
+ return url.join("/") + query;
+ },
+
+ url: function () {
+ return this.urlRef.apply(this, arguments);
+ },
+
+ totalRows: function() {
+ if (this.params.reduce) { return "unknown_reduce";}
+
+ return this.viewMeta.total_rows || "unknown";
+ },
+
+ updateSeq: function() {
+ return this.viewMeta.update_seq || false;
+ },
+
+ simple: function () {
+ var docs = this.map(function (item) {
+ return {
+ _id: item.id,
+ key: item.get('key'),
+ value: item.get('value')
+ };
+ });
+
+ return new Resources.IndexCollection(docs, {
+ database: this.database,
+ params: this.params,
+ view: this.view,
+ design: this.design
+ });
+ },
+
+ parse: function(resp) {
+ var rows = resp.rows;
+ this.endTime = new Date().getTime();
+ this.requestDuration = (this.endTime - this.startTime);
+
+ return PagingCollection.prototype.parse.apply(this, arguments);
+ },
+
+ buildAllDocs: function(){
+ this.fetch();
+ },
+
+ // We implement our own fetch to store the starttime so we that
+ // we can get the request duration
+ fetch: function () {
+ this.startTime = new Date().getTime();
+ return PagingCollection.prototype.fetch.call(this);
+ },
+
+ allDocs: function(){
+ return this.models;
+ },
+
+ // This is taken from futon.browse.js $.timeString
+ requestDurationInString: function () {
+ var ms, sec, min, h, timeString, milliseconds = this.requestDuration;
+
+ sec = Math.floor(milliseconds / 1000.0);
+ min = Math.floor(sec / 60.0);
+ sec = (sec % 60.0).toString();
+ if (sec.length < 2) {
+ sec = "0" + sec;
+ }
+
+ h = (Math.floor(min / 60.0)).toString();
+ if (h.length < 2) {
+ h = "0" + h;
+ }
+
+ min = (min % 60.0).toString();
+ if (min.length < 2) {
+ min = "0" + min;
+ }
+
+ timeString = h + ":" + min + ":" + sec;
+
+ ms = (milliseconds % 1000.0).toString();
+ while (ms.length < 3) {
+ ms = "0" + ms;
+ }
+ timeString += "." + ms;
+
+ return timeString;
+ }
+
+ });
+
+ return Resources;
+});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/routes-core.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/routes-core.js b/app/addons/indexes/routes-core.js
new file mode 100644
index 0000000..354afb0
--- /dev/null
+++ b/app/addons/indexes/routes-core.js
@@ -0,0 +1,129 @@
+// 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.
+define([
+ "app",
+ "api",
+ "addons/databases/base",
+ "addons/indexes/views",
+ "addons/documents/views",
+ "addons/indexes/resources"
+],
+
+function (app, FauxtonAPI, Databases, Views, Documents, Resources) {
+
+ var CoreIndexRouteObj = FauxtonAPI.RouteObject.extend({
+ layout: "two_pane",
+
+ initialize: function (route, masterLayout, options) {
+ this.databaseName = options[0];
+
+ this.data = {
+ database: new Databases.Model({id:this.databaseName})
+ };
+
+ this.data.designDocs = new Documents.AllDocs(null, {
+ database: this.data.database,
+ paging: {
+ pageSize: 500
+ },
+ params: {
+ startkey: '_design',
+ endkey: '_design1',
+ include_docs: true,
+ limit: 500
+ }
+ });
+ },
+
+ events: {
+ "route:updatePreviewDocs": "updateAllDocsFromPreview"
+ },
+
+ ddocInfo: function (designDoc, designDocs, view) {
+ return {
+ id: "_design/" + designDoc,
+ currView: view,
+ designDocs: designDocs
+ };
+ },
+
+ createParams: function (options) {
+ var urlParams = app.getParams(options);
+ var params = Documents.QueryParams.parse(urlParams);
+
+ return {
+ urlParams: urlParams,
+ docParams: _.extend(params, {limit: this.getDocPerPageLimit(params, 20)})
+ };
+ },
+
+ getDocPerPageLimit: function (urlParams, perPage) {
+ var storedPerPage = perPage;
+
+ if (window.localStorage) {
+ storedPerPage = window.localStorage.getItem('fauxton:perpage');
+
+ if (!storedPerPage) {
+ this.setDocPerPageLimit(perPage);
+ storedPerPage = perPage;
+ } else {
+ storedPerPage = parseInt(storedPerPage, 10);
+ }
+ }
+
+ if (!urlParams.limit || urlParams.limit > storedPerPage) {
+ return parseInt(storedPerPage, 10);
+ } else {
+ return parseInt(urlParams.limit, 10);
+ }
+ },
+
+ establish: function () {
+ return this.data.designDocs.fetch({reset: true});
+ },
+
+ createViewDocumentsView: function (options) {
+ return this.setView("#right-content", new Documents.Views.AllDocsList({
+ database: options.database,
+ collection: options.indexedDocs,
+ nestedView: Views.Row,
+ viewList: true,
+ ddocInfo: this.ddocInfo(options.designDoc, options.designDocs, options.view),
+ docParams: options.docParams,
+ params: options.urlParams
+ }));
+ },
+
+ updateAllDocsFromPreview: function (event) {
+ var view = event.view,
+ rows = event.rows,
+ ddoc = event.ddoc;
+
+ this.data.indexedDocs = new Documents.PouchIndexCollection(null, {
+ database: this.data.database,
+ design: ddoc,
+ view: view,
+ rows: rows
+ });
+
+ this.documentsView = this.setView("#right-content", new Documents.Views.AllDocsList({
+ database: this.data.database,
+ collection: this.data.indexedDocs,
+ nestedView: Views.Row,
+ viewList: true
+ }));
+ }
+ });
+
+ return CoreIndexRouteObj;
+
+});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/routes-list.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/routes-list.js b/app/addons/indexes/routes-list.js
new file mode 100644
index 0000000..e7a2282
--- /dev/null
+++ b/app/addons/indexes/routes-list.js
@@ -0,0 +1,70 @@
+// 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.
+define([
+ "app",
+ "api",
+ "addons/databases/base",
+ "addons/indexes/views",
+ "addons/documents/views",
+ "addons/indexes/resources",
+ "addons/indexes/routes-core"
+],
+
+function (app, FauxtonAPI, Databases, Views, Documents, Resources, RouteCore) {
+
+ var ListIndexes = RouteCore.extend({
+ routes: {
+ "database/:database/_design/:ddoc/_lists/:fn": {
+ route: "tempFn",
+ roles: ['_admin']
+ },
+ "database/:database/new_list": "newListsEditor",
+ "database/:database/_design/:designDoc/new_list": "newListsEditor"
+ },
+
+ apiUrl: function() {
+ //TODO: Hook up proper API urls
+ return '';
+ },
+
+ newListsEditor: function (database, designDoc) {
+ var params = app.getParams();
+
+ this.setView("#left-content", new Views.ListEditor({
+ currentddoc: "_design/"+designDoc || "",
+ ddocs: this.data.designDocs,
+ params: params,
+ database: this.data.database,
+ newView: true
+ }));
+
+ this.setView("#right-content", new Views.PreviewScreen({}));
+ this.crumbs = function () {
+ return [
+ {"name": "Create List Index", "link": Databases.databaseUrl(this.data.database)},
+ ];
+ };
+ },
+ tempFn: function(databaseName, ddoc, fn){
+ this.setView("#left-content", new Views.ListEditor({}));
+
+ this.setView("#right-content", new Views.PreviewScreen({}));
+ this.crumbs = function () {
+ return [
+ {"name": this.data.database.id, "link": Databases.databaseUrl(this.data.database)},
+ ];
+ };
+ }
+ });
+
+ return ListIndexes;
+});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/routes-show.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/routes-show.js b/app/addons/indexes/routes-show.js
new file mode 100644
index 0000000..9c9e451
--- /dev/null
+++ b/app/addons/indexes/routes-show.js
@@ -0,0 +1,71 @@
+// 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.
+define([
+ "app",
+ "api",
+ "addons/databases/base",
+ "addons/indexes/views",
+ "addons/documents/views",
+ "addons/indexes/resources",
+ "addons/indexes/routes-core"
+],
+
+function (app, FauxtonAPI, Databases, Views, Documents, Resources, RouteCore) {
+
+ var ShowIndexes = RouteCore.extend({
+ routes: {
+ "database/:database/_design/:ddoc/_show/:fn": {
+ route: "tempFn",
+ roles: ['_admin']
+ },
+ "database/:database/new_show": "newShowEditor",
+ "database/:database/_design/:designDoc/new_show": "newShowEditor"
+ },
+
+ newShowEditor: function (database, designDoc) {
+ var params = app.getParams();
+
+ this.setView("#left-content", new Views.ShowEditor({
+ currentddoc: "_design/"+designDoc || "",
+ ddocs: this.data.designDocs,
+ params: params,
+ database: this.data.database,
+ newView: true
+ }));
+
+ this.setView("#right-content", new Views.PreviewScreen({}));
+ this.crumbs = function () {
+ return [
+ {"name": "Create Show Index", "link": Databases.databaseUrl(this.data.database)},
+ ];
+ };
+ },
+
+ apiUrl: function() {
+ //TODO: Hook up proper API urls
+ return '';
+ },
+
+ tempFn: function(databaseName, ddoc, fn){
+ this.setView("#left-content", new Views.ShowEditor({}));
+
+ this.setView("#right-content", new Views.PreviewScreen({}));
+ this.crumbs = function () {
+ return [
+ {"name": this.data.database.id, "link": Databases.databaseUrl(this.data.database)},
+ ];
+ };
+ }
+ });
+
+ return ShowIndexes;
+});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/routes-viewindexes.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/routes-viewindexes.js b/app/addons/indexes/routes-viewindexes.js
new file mode 100644
index 0000000..86006f3
--- /dev/null
+++ b/app/addons/indexes/routes-viewindexes.js
@@ -0,0 +1,106 @@
+// 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.
+define([
+ "app",
+ "api",
+ "addons/databases/base",
+ "addons/indexes/views",
+ "addons/documents/views",
+ "addons/indexes/resources",
+ "addons/indexes/routes-core"
+],
+
+function (app, FauxtonAPI, Databases, Views, Documents, Resources, RouteCore) {
+
+ var ViewIndexes = RouteCore.extend({
+ routes: {
+ "database/:database/_design/:ddoc/_view/:view": {
+ route: "viewFn",
+ roles: ['_admin']
+ },
+ "database/:database/new_view": "newViewEditor",
+ "database/:database/_design/:designDoc/new_view": "newViewEditor"
+ },
+
+ newViewEditor: function (database, designDoc) {
+ var params = app.getParams();
+
+ this.setView("#right-content", new Views.PreviewScreen({}));
+
+ this.viewEditor = this.setView("#left-content", new Views.ViewEditor({
+ currentddoc: "_design/"+designDoc || "",
+ ddocs: this.data.designDocs,
+ params: params,
+ database: this.data.database,
+ newView: true
+ }));
+
+ this.crumbs = function () {
+ return [
+ {"name": "Create View Index", "link": Databases.databaseUrl(this.data.database)},
+ ];
+ };
+ },
+
+ viewFn: function (databaseName, ddoc, view) {
+ var params = this.createParams(),
+ urlParams = params.urlParams,
+ docParams = params.docParams,
+ decodeDdoc = decodeURIComponent(ddoc);
+
+ view = view.replace(/\?.*$/,'');
+
+ this.data.indexedDocs = new Resources.IndexCollection(null, {
+ database: this.data.database,
+ design: decodeDdoc,
+ view: view,
+ params: docParams,
+ paging: {
+ pageSize: this.getDocPerPageLimit(urlParams, parseInt(docParams.limit, 10))
+ }
+ });
+
+ this.viewEditor = this.setView("#left-content", new Views.ViewEditor({
+ model: this.data.database,
+ ddocs: this.data.designDocs,
+ viewName: view,
+ params: urlParams,
+ newView: false,
+ database: this.data.database,
+ ddocInfo: this.ddocInfo(decodeDdoc, this.data.designDocs, view)
+ }));
+
+ this.toolsView && this.toolsView.remove();
+
+ this.documentsView = this.createViewDocumentsView({
+ designDoc: decodeDdoc,
+ docParams: docParams,
+ urlParams: urlParams,
+ database: this.data.database,
+ indexedDocs: this.data.indexedDocs,
+ designDocs: this.data.designDocs,
+ view: view
+ });
+
+
+ this.crumbs = function () {
+ return [
+ {"name": view, "link": Databases.databaseUrl(this.data.database)},
+ ];
+ };
+
+ this.apiUrl = [this.data.indexedDocs.urlRef("apiurl", urlParams), "docs"];
+ }
+ });
+
+ return ViewIndexes;
+});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/routes.js b/app/addons/indexes/routes.js
new file mode 100644
index 0000000..90c9aac
--- /dev/null
+++ b/app/addons/indexes/routes.js
@@ -0,0 +1,24 @@
+// 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.
+define([
+ "app",
+ "api",
+ "addons/indexes/views",
+ "addons/indexes/routes-viewindexes",
+ "addons/indexes/routes-show",
+ "addons/indexes/routes-list",
+],
+
+function (app, FauxtonAPI, Views, ViewIndex, Show, List) {
+ Views.RouteObjects = [ViewIndex, Show, List];
+ return Views;
+});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/templates/design_doc_selector.html
----------------------------------------------------------------------
diff --git a/app/addons/indexes/templates/design_doc_selector.html b/app/addons/indexes/templates/design_doc_selector.html
new file mode 100644
index 0000000..d12cd64
--- /dev/null
+++ b/app/addons/indexes/templates/design_doc_selector.html
@@ -0,0 +1,38 @@
+<!--
+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="span3">
+ <label for="ddoc">Save to Design Document <a class="help-link" data-bypass="true" href="<%-getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <select id="ddoc">
+ <optgroup label="Select a document">
+ <option value="new-doc">New document</option>
+
+ <% ddocs.each(function(ddoc) { %>
+ <%= ddoc.id %>
+ <%= ddocName %>
+ <% if (ddoc.id === ddocName) { %>
+ <option selected="selected" value="<%- ddoc.id %>"><%- ddoc.id %></option>
+ <% } else { %>
+ <option value="<%- ddoc.id %>"><%- ddoc.id %></option>
+ <% } %>
+ <% }); %>
+ </optgroup>
+ </select>
+</div>
+
+<div id="new-ddoc-section" class="span5" style="display:none">
+ <label class="control-label" for="new-ddoc"> _design/ </label>
+ <div class="controls">
+ <input type="text" id="new-ddoc" placeholder="newDesignDoc" />
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/templates/index_header.html
----------------------------------------------------------------------
diff --git a/app/addons/indexes/templates/index_header.html b/app/addons/indexes/templates/index_header.html
new file mode 100644
index 0000000..662f3ea
--- /dev/null
+++ b/app/addons/indexes/templates/index_header.html
@@ -0,0 +1,30 @@
+<!--
+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="header-left">
+
+<!--back arrow-->
+<span class="icon "
+
+<!--title-->
+
+<!-- Menu gear-->
+
+</div>
+
+
+<div class="header-right">
+ <!-- Query Options-->
+ <!--right margin for api bar-->
+</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/templates/index_row_docular.html
----------------------------------------------------------------------
diff --git a/app/addons/indexes/templates/index_row_docular.html b/app/addons/indexes/templates/index_row_docular.html
new file mode 100644
index 0000000..ba88d06
--- /dev/null
+++ b/app/addons/indexes/templates/index_row_docular.html
@@ -0,0 +1,35 @@
+<!--
+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.
+-->
+<% if (doc.isEditable()) { %>
+ <div class="select"><input type="checkbox"></div>
+<% } %>
+
+<div class="doc-item">
+ <header>
+ _id <span class="header-id-number">"<%=docID%>"</span>
+
+ <div class="doc-menu">
+ <a href="#<%= url %>" class="doc-menu-item icon fonticon-pencil"></a>
+ <% if (doc.isEditable()) { %>
+ <button href="#" class="btn btn-small btn-danger delete" title="Delete this document."><i class="icon icon-trash"></i></button>
+ <% } %>
+
+ <div id="view-doc-menu" class="doc-menu-item"></div>
+ </div>
+ </header>
+ <div class="doc-data">
+ <pre class="prettyprint"><%- doc.prettyJSON() %></pre>
+ </div>
+</div>
+<div class="clearfix"></div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/templates/list_editor.html
----------------------------------------------------------------------
diff --git a/app/addons/indexes/templates/list_editor.html b/app/addons/indexes/templates/list_editor.html
new file mode 100644
index 0000000..d36004c
--- /dev/null
+++ b/app/addons/indexes/templates/list_editor.html
@@ -0,0 +1,39 @@
+<!--
+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="all-docs-list errors-container"></div>
+<div id="define-view" class="ddoc-alert index-form">
+ <div class="errors-container"></div>
+ <form class="form-horizontal view-query-save">
+ <div class="control-group">
+ <p>Views are the primary tool used for querying and reporting on CouchDB databases.</p>
+ </div>
+
+ <div class="control-group design-doc-group">
+ </div>
+
+
+ <div class="control-group">
+ <label for="index-name">Index name <a class="help-link" href="<%-getDocUrl('view_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <input type="text" id="index-name" value="<%- viewName %>" placeholder="Index name" />
+ </div>
+
+ <div class="control-group">
+ <button class="btn btn-success save"><i class="icon fonticon-ok-circled"></i> Save & Build Index</button>
+ <% if (!newView) { %>
+ <button class="btn btn-danger delete"><i class="icon fonticon-cancel-circled"></i> Delete</button>
+ <% } %>
+ </div>
+ <div class="clearfix"></div>
+ </form>
+</div>=
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/templates/preview_screen.html
----------------------------------------------------------------------
diff --git a/app/addons/indexes/templates/preview_screen.html b/app/addons/indexes/templates/preview_screen.html
new file mode 100644
index 0000000..654e557
--- /dev/null
+++ b/app/addons/indexes/templates/preview_screen.html
@@ -0,0 +1,16 @@
+<!--
+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.
+-->
+
+<h3>No Index Created Yet!</h3>
+<p> Run <span class="btn btn-success preview icon fonticon-play"> Preview</span> to query result</p>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/templates/show_editor.html
----------------------------------------------------------------------
diff --git a/app/addons/indexes/templates/show_editor.html b/app/addons/indexes/templates/show_editor.html
new file mode 100644
index 0000000..9afa2bf
--- /dev/null
+++ b/app/addons/indexes/templates/show_editor.html
@@ -0,0 +1,41 @@
+<!--
+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="all-docs-list errors-container"></div>
+<div id="define-view" class="ddoc-alert index-form">
+ <div class="errors-container"></div>
+ <form class="form-horizontal view-query-save">
+ <div class="control-group">
+ <p>Views are the primary tool used for querying and reporting on CouchDB databases.</p>
+ </div>
+
+ <div class="control-group design-doc-group">
+ </div>
+
+
+ <div class="control-group">
+ <label for="index-name">Index name <a class="help-link" href="<%-getDocUrl('view_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <input type="text" id="index-name" value="<%- viewName %>" placeholder="Index name" />
+ </div>
+
+
+ <div class="control-group">
+ <button class="btn btn-success save"><i class="icon fonticon-ok-circled"></i> Save & Build Index</button>
+ <% if (!newView) { %>
+ <button class="btn btn-danger delete"><i class="icon fonticon-cancel-circled"></i> Delete</button>
+ <% } %>
+ </div>
+ <div class="clearfix"></div>
+ </form>
+</div>=
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/templates/view_editor.html
----------------------------------------------------------------------
diff --git a/app/addons/indexes/templates/view_editor.html b/app/addons/indexes/templates/view_editor.html
new file mode 100644
index 0000000..f33d3f9
--- /dev/null
+++ b/app/addons/indexes/templates/view_editor.html
@@ -0,0 +1,80 @@
+<!--
+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="all-docs-list errors-container"></div>
+<div id="define-view" class="ddoc-alert index-form">
+ <div class="errors-container"></div>
+ <form class="form-horizontal view-query-save">
+ <div class="control-group">
+ <p>Views are the primary tool used for querying and reporting on CouchDB databases.</p>
+ </div>
+
+
+ <div class="control-group">
+ <label for="index-name">Database name</label>
+ <p><%- database %></p>
+ </div>
+
+
+ <div class="control-group design-doc-group">
+ </div>
+
+
+ <div class="control-group">
+ <label for="index-name">Index name <a class="help-link" href="<%-getDocUrl('view_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <input type="text" id="index-name" value="<%- viewName %>" placeholder="Index name" />
+ </div>
+
+ <div class="control-group">
+ <label for="map-function">Map function <a class="help-link" href="<%-getDocUrl('map_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <% if (newView) { %>
+ <div class="js-editor" id="map-function"><%= langTemplates.map %></div>
+ <% } else { %>
+ <div class="js-editor" id="map-function"><%- ddoc.get('views')[viewName].map %></div>
+ <button class="beautify beautify_map btn btn-primary btn-large hide beautify-tooltip" type="button" data-toggle="tooltip" title="Reformat your minified code to make edits to it.">beautify this code</button>
+ <% } %>
+ </div>
+
+
+ <div class="control-group">
+ <label for="reduce-function-selector">Reduce (optional) <a class="help-link" href="<%-getDocUrl('reduce_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+
+ <select id="reduce-function-selector">
+ <option value="" <%- !reduceFunStr ? 'selected="selected"' : '' %>>None</option>
+ <% _.each(["_sum", "_count", "_stats"], function(reduce) { %>
+ <option value="<%- reduce %>" <% if (reduce == reduceFunStr) { %>selected<% } %>><%= reduce %></option>
+ <% }) %>
+ <option value="CUSTOM" <% if (isCustomReduce) { %>selected<% } %>>Custom Reduce function</option>
+ </select>
+ </div>
+
+ <div class="control-group reduce-function">
+ <label for="reduce-function">Custom Reduce function</label>
+ <% if (newView) { %>
+ <div class="js-editor" id="reduce-function"><%- langTemplates.reduce %></div>
+ <% } else { %>
+ <div class="js-editor" id="reduce-function"><%- ddoc.get('views')[viewName].reduce %></div>
+ <button class="beautify beautify_reduce btn btn-primary btn-large hide beautify-tooltip" type="button" data-toggle="tooltip" title="Reformat your minified code to make edits to it.">beautify this code</button>
+ <% } %>
+ </div>
+
+ <div class="control-group">
+ <button class="btn btn-success save"><i class="icon fonticon-ok-circled"></i> Save & Build Index</button>
+ <% if (!newView) { %>
+ <button class="btn btn-danger delete"><i class="icon fonticon-cancel-circled"></i> Delete</button>
+ <% } %>
+ </div>
+ <div class="clearfix"></div>
+ </form>
+</div>
+
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/addons/indexes/views.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/views.js b/app/addons/indexes/views.js
new file mode 100644
index 0000000..73ed6ea
--- /dev/null
+++ b/app/addons/indexes/views.js
@@ -0,0 +1,678 @@
+// 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.
+
+define([
+ "app",
+
+ "api",
+ "addons/fauxton/components",
+
+ "addons/documents/resources",
+ "addons/databases/resources",
+ "addons/pouchdb/base",
+ //views
+ "addons/documents/views-advancedopts",
+ // Libs
+ "addons/fauxton/resizeColumns",
+
+ // Plugins
+ "plugins/beautify",
+ "plugins/prettify"
+],
+
+function(app, FauxtonAPI, Components, Documents, Databases, pouchdb,
+ QueryOptions, resizeColumns, beautify, prettify) {
+
+ var Views = {};
+
+ //Index view CORE extend this
+ Views.IndexCore = FauxtonAPI.View.extend({
+ langTemplates: {
+ "javascript": {
+ map: "function(doc) {\n emit(doc._id, 1);\n}",
+ reduce: "function(keys, values, rereduce){\n if (rereduce){\n return sum(values);\n } else {\n return values.length;\n }\n}"
+ }
+ },
+
+ defaultLang: "javascript",
+
+ initialize: function(options) {
+ this.newView = options.newView || false;
+ this.ddocs = options.ddocs;
+ this.params = options.params;
+ this.database = options.database;
+ this.currentDdoc = options.currentddoc;
+ if (this.newView) {
+ this.viewName = 'newView';
+ } else {
+ this.ddocID = options.ddocInfo.id;
+ this.viewName = options.viewName;
+ this.ddocInfo = new Documents.DdocInfo({_id: this.ddocID},{database: this.database});
+ }
+
+ this.showIndex = false;
+ _.bindAll(this);
+ },
+ establish: function () {
+ if (this.ddocInfo) {
+ return this.ddocInfo.fetch();
+ }
+ },
+ serialize: function() {
+ return {
+ database: this.database.get('id'),
+ ddocs: this.ddocs,
+ ddoc: this.model,
+ ddocName: this.model.id,
+ viewName: this.viewName,
+ reduceFunStr: this.reduceFunStr,
+ isCustomReduce: this.hasCustomReduce(),
+ newView: this.newView,
+ langTemplates: this.langTemplates.javascript
+ };
+ }
+ });
+
+
+
+ Views.IndexHeader = Views.IndexCore.extend({
+ template: "addons/indexes/templates/index_header"
+ });
+
+ Views.PreviewScreen = Views.IndexCore.extend({
+ template: "addons/indexes/templates/preview_screen",
+ className: "watermark-logo"
+ });
+
+ Views.ShowEditor = FauxtonAPI.View.extend({
+ template: "addons/indexes/templates/show_editor",
+ initialize: function(options) {
+ this.newView = options.newView || false;
+ this.ddocs = options.ddocs;
+ this.params = options.params;
+ this.database = options.database;
+ this.currentDdoc = options.currentddoc;
+ if (this.newView) {
+ this.viewName = 'newView';
+ } else {
+ this.ddocID = options.ddocInfo.id;
+ this.viewName = options.viewName;
+ this.ddocInfo = new Documents.DdocInfo({_id: this.ddocID},{database: this.database});
+ }
+
+ this.showIndex = false;
+ _.bindAll(this);
+ },
+ });
+
+ Views.ListEditor = FauxtonAPI.View.extend({
+ template: "addons/indexes/templates/list_editor",
+ });
+
+
+
+ Views.Row = FauxtonAPI.View.extend({
+ template: "addons/indexes/templates/index_row_docular",
+ className: "doc-row",
+ events: {
+ "click button.delete": "destroy"
+ },
+
+ destroy: function (event) {
+ event.preventDefault();
+
+ window.alert('Cannot delete a document generated from a view.');
+ },
+
+ beforeRender: function(){
+ var newLinks = [{
+ links: [{
+ title: 'Table',
+ icon: 'fonticon-table'
+ },{
+ title: 'JSON',
+ icon: 'fonticon-json'
+ }]
+ }];
+
+ this.insertView("#view-doc-menu", new Components.MenuDropDown({
+ icon: 'fonticon-drop-down-dots',
+ links: newLinks,
+ }));
+ },
+
+ serialize: function() {
+ return {
+ docID: this.model.get('id'),
+ doc: this.model,
+ url: this.model.url('app')
+ };
+ }
+ });
+
+
+
+
+
+
+ Views.ViewEditor = FauxtonAPI.View.extend({
+ template: "addons/indexes/templates/view_editor",
+ builtinReduces: ['_sum', '_count', '_stats'],
+
+ events: {
+ "click button.save": "saveView",
+ "click button.delete": "deleteView",
+ "change select#reduce-function-selector": "updateReduce",
+ "click button.preview": "previewView",
+ "click #db-views-tabs-nav": 'toggleIndexNav',
+ "click .beautify_map": "beautifyCode",
+ "click .beautify_reduce": "beautifyCode"
+ },
+
+ langTemplates: {
+ "javascript": {
+ map: "function(doc) {\n emit(doc._id, 1);\n}",
+ reduce: "function(keys, values, rereduce){\n if (rereduce){\n return sum(values);\n } else {\n return values.length;\n }\n}"
+ }
+ },
+
+ defaultLang: "javascript",
+
+ initialize: function(options) {
+ this.newView = options.newView || false;
+ this.ddocs = options.ddocs;
+ this.params = options.params;
+ this.database = options.database;
+ this.currentDdoc = options.currentddoc;
+ if (this.newView) {
+ this.viewName = 'newView';
+ } else {
+ this.ddocID = options.ddocInfo.id;
+ this.viewName = options.viewName;
+ this.ddocInfo = new Documents.DdocInfo({_id: this.ddocID},{database: this.database});
+ }
+
+ this.showIndex = false;
+ _.bindAll(this);
+ },
+
+ establish: function () {
+ if (this.ddocInfo) {
+ return this.ddocInfo.fetch();
+ }
+ },
+
+ updateValues: function() {
+ var notification;
+ if (this.model.changedAttributes()) {
+ notification = FauxtonAPI.addNotification({
+ msg: "Document saved successfully.",
+ type: "success",
+ clear: true
+ });
+ this.editor.setValue(this.model.prettyJSON());
+ }
+ },
+
+ updateReduce: function(event) {
+ var $ele = $("#reduce-function-selector");
+ var $reduceContainer = $(".control-group.reduce-function");
+ if ($ele.val() == "CUSTOM") {
+ this.createReduceEditor();
+ this.reduceEditor.setValue(this.langTemplates.javascript.reduce);
+ $reduceContainer.show();
+ } else {
+ $reduceContainer.hide();
+ }
+ },
+
+ deleteView: function (event) {
+ event.preventDefault();
+
+ if (this.newView) { return alert('Cannot delete a new view.'); }
+ if (!confirm('Are you sure you want to delete this view?')) {return;}
+
+ var that = this,
+ promise,
+ viewName = this.$('#index-name').val(),
+ ddocName = this.$('#ddoc :selected').val(),
+ ddoc = this.getCurrentDesignDoc();
+
+ ddoc.removeDdocView(viewName);
+
+ if (ddoc.hasViews()) {
+ promise = ddoc.save();
+ } else {
+ promise = ddoc.destroy();
+ }
+
+ promise.then(function () {
+ FauxtonAPI.navigate('/database/' + that.database.safeID() + '/_all_docs?limit=' + Databases.DocLimit);
+ FauxtonAPI.triggerRouteEvent('reloadDesignDocs');
+ });
+ },
+
+ saveView: function(event) {
+ var json, notification,
+ that = this;
+
+ if (event) { event.preventDefault();}
+
+ $('#dashboard-content').scrollTop(0); //scroll up
+ //check if the code is valid & the inputs are filled out
+ if (this.hasValidCode() && this.$('#new-ddoc:visible').val() !=="") {
+ var mapVal = this.mapEditor.getValue(),
+ reduceVal = this.reduceVal(),
+ viewName = this.$('#index-name').val(),
+ ddoc = this.getCurrentDesignDoc(),
+ ddocName = ddoc.id;
+ this.viewNameChange = false;
+
+
+ if (this.viewName !== viewName) {
+ ddoc.removeDdocView(this.viewName);
+ this.viewName = viewName;
+ this.viewNameChange = true;
+ }
+
+ notification = FauxtonAPI.addNotification({
+ msg: "Saving document.",
+ selector: "#define-view .errors-container",
+ clear: true
+ });
+
+ ddoc.setDdocView(viewName, mapVal, reduceVal);
+
+ ddoc.save().then(function () {
+ //on success
+ that.afterSave(ddoc, viewName, ddocName);
+ },
+ function(xhr) {
+ //on failure
+ var responseText = JSON.parse(xhr.responseText).reason;
+ notification = FauxtonAPI.addNotification({
+ msg: "Save failed: " + responseText,
+ type: "error",
+ clear: true
+ });
+ });
+ } else {
+ //if nothing is filled out give an error message
+ var errormessage = (this.$('#new-ddoc:visible').val() ==="")?"Enter a design doc name":"Please fix the Javascript errors and try again.";
+ notification = FauxtonAPI.addNotification({
+ msg: errormessage,
+ type: "error",
+ selector: "#define-view .errors-container",
+ clear: true
+ });
+ }
+ },
+
+ afterSave: function(ddoc, viewName, ddocName){
+ var reduceVal = this.reduceVal();
+ //add ddoc to the collection
+ this.ddocs.add(ddoc);
+
+ //trigger the EditSaved function on the map editor & reduce editor
+ this.mapEditor.editSaved();
+ this.reduceEditor && this.reduceEditor.editSaved();
+
+
+ //show a notification
+ FauxtonAPI.addNotification({
+ msg: "View has been saved.",
+ type: "success",
+ selector: "#define-view .errors-container",
+ clear: true
+ });
+
+
+ //if it's new or the name changed (aka created a new doc)
+ if (this.newView || this.viewNameChange) {
+ var fragment = '/database/' + this.database.safeID() +'/' + ddoc.safeID() + '/_view/' + app.utils.safeURLName(viewName);
+
+ FauxtonAPI.navigate(fragment, {trigger: false});
+ this.newView = false;
+ this.ddocID = ddoc.safeID();
+ this.viewName = viewName;
+ this.ddocInfo = ddoc;
+ this.showIndex = true;
+ this.render();
+ FauxtonAPI.triggerRouteEvent('reloadDesignDocs', {
+ selectedTab: app.utils.removeSpecialCharacters(ddocName.replace(/_design\//,'')) + '_' + app.utils.removeSpecialCharacters(viewName)
+ });
+ }
+
+ // TODO:// this should change to a trigger because we shouldn't define advanced options in this view
+ if (this.reduceFunStr !== reduceVal) {
+ this.reduceFunStr = reduceVal;
+ // this.advancedOptions.renderOnUpdatehasReduce(this.hasReduce());
+ }
+
+ // Route Event will reload the right content
+ FauxtonAPI.triggerRouteEvent('updateAllDocs', {ddoc: ddocName, view: viewName});
+ },
+
+ updateView: function(event, paramInfo) {
+ event.preventDefault();
+
+ if (this.newView) { return alert('Please save this new view before querying it.'); }
+
+ var errorParams = paramInfo.errorParams,
+ params = paramInfo.params;
+
+ if (_.any(errorParams)) {
+ _.map(errorParams, function(param) {
+
+ // TODO: Where to add this error?
+ // bootstrap wants the error on a control-group div, but we're not using that
+ //$('form.view-query-update input[name='+param+'], form.view-query-update select[name='+param+']').addClass('error');
+ return FauxtonAPI.addNotification({
+ msg: "JSON Parse Error on field: "+param.name,
+ type: "error",
+ selector: ".advanced-options .errors-container",
+ clear: true
+ });
+ });
+ FauxtonAPI.addNotification({
+ msg: "Make sure that strings are properly quoted and any other values are valid JSON structures",
+ type: "warning",
+ selector: ".advanced-options .errors-container",
+ clear: true
+ });
+
+ return false;
+ }
+
+ var fragment = window.location.hash.replace(/\?.*$/, '');
+ if (!_.isEmpty(params)) {
+ fragment = fragment + '?' + $.param(params);
+ }
+
+ FauxtonAPI.navigate(fragment, {trigger: false});
+ FauxtonAPI.triggerRouteEvent('updateAllDocs', {ddoc: this.ddocID, view: this.viewName});
+ },
+
+
+ previewView: function(event, paramsInfo) {
+ event.preventDefault();
+ var that = this,
+ mapVal = this.mapVal(),
+ reduceVal = this.reduceVal(),
+ paramsArr = [];
+
+ if (paramsInfo && paramsInfo.params) {
+ paramsArr = paramsInfo.params;
+ }
+
+ var params = _.reduce(paramsArr, function (params, param) {
+ params[param.name] = param.value;
+ return params;
+ }, {reduce: false});
+
+ FauxtonAPI.addNotification({
+ msg: "<strong>Warning!</strong> Preview executes the Map/Reduce functions in your browser, and may behave differently from CouchDB.",
+ type: "warning",
+ selector: ".advanced-options .errors-container",
+ fade: true,
+ escape: false // beware of possible XSS when the message changes
+ });
+
+ var promise = FauxtonAPI.Deferred();
+
+ if (!this.database.allDocs || this.database.allDocs.params.include_docs !== true) {
+ this.database.buildAllDocs({limit: Databases.DocLimit.toString(), include_docs: true});
+ promise = this.database.allDocs.fetch();
+ } else {
+ promise.resolve();
+ }
+
+ promise.then(function () {
+ params.docs = that.database.allDocs.map(function (model) { return model.get('doc');});
+ var queryPromise = pouchdb.runViewQuery({map: mapVal, reduce: reduceVal}, params);
+ queryPromise.then(function (results) {
+ FauxtonAPI.triggerRouteEvent('updatePreviewDocs', {rows: results.rows, ddoc: that.getCurrentDesignDoc().id, view: that.viewName});
+ });
+ });
+ },
+
+ getCurrentDesignDoc: function () {
+ return this.designDocSelector.getCurrentDesignDoc();
+ },
+
+ isCustomReduceEnabled: function() {
+ return $("#reduce-function-selector").val() == "CUSTOM";
+ },
+
+ mapVal: function () {
+ if (this.mapEditor) {
+ return this.mapEditor.getValue();
+ }
+
+ return this.$('#map-function').text();
+ },
+
+ reduceVal: function() {
+ var reduceOption = this.$('#reduce-function-selector :selected').val(),
+ reduceVal = "";
+
+ if (reduceOption === 'CUSTOM') {
+ if (!this.reduceEditor) { this.createReduceEditor(); }
+ reduceVal = this.reduceEditor.getValue();
+ } else if ( reduceOption !== 'NONE') {
+ reduceVal = reduceOption;
+ }
+
+ return reduceVal;
+ },
+
+
+ hasValidCode: function() {
+ return _.every(["mapEditor", "reduceEditor"], function(editorName) {
+ var editor = this[editorName];
+ if (editorName === "reduceEditor" && ! this.isCustomReduceEnabled()) {
+ return true;
+ }
+ return editor.hadValidCode();
+ }, this);
+ },
+
+
+ serialize: function() {
+ return {
+ database: this.database.get('id'),
+ ddocs: this.ddocs,
+ ddoc: this.model,
+ ddocName: this.model.id,
+ viewName: this.viewName,
+ reduceFunStr: this.reduceFunStr,
+ isCustomReduce: this.hasCustomReduce(),
+ newView: this.newView,
+ langTemplates: this.langTemplates.javascript
+ };
+ },
+
+ hasCustomReduce: function() {
+ return this.reduceFunStr && ! _.contains(this.builtinReduces, this.reduceFunStr);
+ },
+
+ hasReduce: function () {
+ return this.reduceFunStr || false;
+ },
+
+ createReduceEditor: function () {
+ if (this.reduceEditor) {
+ this.reduceEditor.remove();
+ }
+
+ this.reduceEditor = new Components.Editor({
+ editorId: "reduce-function",
+ mode: "javascript",
+ couchJSHINT: true
+ });
+ this.reduceEditor.render();
+
+ if (this.reduceEditor.getLines() === 1){
+ this.$('.beautify_reduce').removeClass("hide");
+ $('.beautify-tooltip').tooltip();
+ }
+ },
+ beforeRender: function () {
+
+ if (this.newView) {
+ this.reduceFunStr = '';
+ if (this.ddocs.length === 0) {
+ this.model = new Documents.Doc(null, {database: this.database});
+ } else {
+ this.model = this.ddocs.first().dDocModel();
+ }
+ this.ddocID = this.model.id;
+ } else {
+ var ddocDecode = decodeURIComponent(this.ddocID);
+ this.model = this.ddocs.get(this.ddocID).dDocModel();
+ this.reduceFunStr = this.model.viewHasReduce(this.viewName);
+ }
+
+ var viewFilters = FauxtonAPI.getExtensions('sidebar:viewFilters'),
+ filteredModels = this.ddocs.models,
+ designDocs = this.ddocs.clone();
+
+ if (!_.isEmpty(viewFilters)) {
+ _.each(viewFilters, function (filter) {
+ filteredModels = _.filter(filteredModels, filter);
+ });
+ designDocs.reset(filteredModels, {silent: true});
+ }
+
+ this.designDocSelector = this.setView('.design-doc-group', new Views.DesignDocSelector({
+ collection: designDocs,
+ ddocName: this.currentDdoc || this.model.id,
+ database: this.database
+ }));
+
+ },
+
+ afterRender: function() {
+ //TODO: have this happen on a trigger once we move advanced options to the header
+ // if (this.params && !this.newView) {
+ // this.advancedOptions.updateFromParams(this.params);
+ // }
+
+ this.designDocSelector.updateDesignDoc();
+ this.showEditors();
+ this.showIndex = false;
+
+ },
+
+ showEditors: function () {
+ this.mapEditor = new Components.Editor({
+ editorId: "map-function",
+ mode: "javascript",
+ couchJSHINT: true
+ });
+ this.mapEditor.render();
+
+ if (this.hasCustomReduce()) {
+ this.createReduceEditor();
+ } else {
+ $(".control-group.reduce-function").hide();
+ }
+
+ if (this.newView) {
+ this.mapEditor.setValue(this.langTemplates[this.defaultLang].map);
+ //Use a built in view by default
+ //this.reduceEditor.setValue(this.langTemplates[this.defaultLang].reduce);
+ }
+
+ this.mapEditor.editSaved();
+ this.reduceEditor && this.reduceEditor.editSaved();
+
+ if (this.mapEditor.getLines() === 1){
+ this.$('.beautify_map').removeClass("hide");
+ $('.beautify-tooltip').tooltip();
+ }
+ },
+ beautifyCode: function(e){
+ e.preventDefault();
+ var targetEditor = $(e.currentTarget).hasClass('beautify_reduce')?this.reduceEditor:this.mapEditor;
+ var beautifiedCode = beautify(targetEditor.getValue());
+ targetEditor.setValue(beautifiedCode);
+ },
+ cleanup: function () {
+ this.mapEditor && this.mapEditor.remove();
+ this.reduceEditor && this.reduceEditor.remove();
+ }
+ });
+
+ Views.DesignDocSelector = FauxtonAPI.View.extend({
+ template: "addons/indexes/templates/design_doc_selector",
+
+ events: {
+ "change select#ddoc": "updateDesignDoc"
+ },
+
+ initialize: function (options) {
+ this.ddocName = options.ddocName;
+ this.database = options.database;
+ this.listenTo(this.collection, 'add', this.ddocAdded);
+ this.DocModel = options.DocModel || Documents.Doc;
+ },
+
+ ddocAdded: function (ddoc) {
+ this.ddocName = ddoc.id;
+ this.render();
+ },
+
+ serialize: function () {
+ return {
+ ddocName: this.ddocName,
+ ddocs: this.collection
+ };
+ },
+
+ updateDesignDoc: function () {
+ if (this.newDesignDoc()) {
+ this.$('#new-ddoc-section').show();
+ } else {
+ this.$('#new-ddoc-section').hide();
+ }
+ },
+
+ newDesignDoc: function () {
+
+ return this.$('#ddoc').val() === 'new-doc';
+ },
+
+ newDocValidation: function(){
+ return this.newDesignDoc() && this.$('#new-ddoc').val()==="";
+ },
+ getCurrentDesignDoc: function () {
+ if (this.newDesignDoc()) {
+ var doc = {
+ _id: '_design/' + this.$('#new-ddoc').val(),
+ views: {},
+ language: "javascript"
+ };
+ var ddoc = new this.DocModel(doc, {database: this.database});
+ //this.collection.add(ddoc);
+ return ddoc;
+ } else if ( !this.newDesignDoc() ) {
+ var ddocName = this.$('#ddoc').val();
+ return this.collection.find(function (ddoc) {
+ return ddoc.id === ddocName;
+ }).dDocModel();
+ }
+ }
+ });
+
+ return Views;
+});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/templates/layouts/two_pane.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/two_pane.html b/app/templates/layouts/two_pane.html
index 031ad12..52b7d2a 100644
--- a/app/templates/layouts/two_pane.html
+++ b/app/templates/layouts/two_pane.html
@@ -12,18 +12,16 @@ License for the specific language governing permissions and limitations under
the License.
-->
-
<div id="primary-navbar"></div>
-<div id="dashboard" class="container-fluid">
- <div class="fixed-header">
+<div id="dashboard" class="container-fluid two-pane">
+
+ <header class="fixed-header">
<div id="breadcrumbs"></div>
<div id="api-navbar"></div>
- </div>
+ </header>
-
- <div class="row-fluid content-area">
- <div id="left-content" class="span6"></div>
- <div id="right-content" class="span6"></div>
+ <div class="content-area two-pane">
+ <div id="left-content" class="span6 window-resizeable"></div>
+ <div id="right-content" class="span6 window-resizeable"></div>
</div>
</div>
-
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/app/templates/layouts/with_tabs_sidebar.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/with_tabs_sidebar.html b/app/templates/layouts/with_tabs_sidebar.html
index a0ed03d..65d702e 100644
--- a/app/templates/layouts/with_tabs_sidebar.html
+++ b/app/templates/layouts/with_tabs_sidebar.html
@@ -21,9 +21,6 @@ the License.
</header>
<div class="with-sidebar content-area">
-
- <div id="tabs" class="row-fluid"></div>
-
<aside id="sidebar-content" class="sidebar"></aside>
<section id="dashboard-content" class="list pull-right window-resizeable">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/assets/img/couchWatermark.png
----------------------------------------------------------------------
diff --git a/assets/img/couchWatermark.png b/assets/img/couchWatermark.png
new file mode 100644
index 0000000..cab9ce4
Binary files /dev/null and b/assets/img/couchWatermark.png differ
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 463b1e0..3ddcff9 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -22,7 +22,8 @@
@import "bootstrap/mixins.less";
@import "prettyprint.less";
@import "icons.less";
-
+@import "templates.less";
+@import "formstyles.less";
/**
* HTML-wide overrides
**/
@@ -56,28 +57,7 @@ a:hover {
color: @red;
}
-input[type=text],
-input[type=password] {
- .border-radius(0);
- padding: 12px;
- border: 1px solid #ccc;
- height: auto;
- font-size: 16px;
- margin-top: 0;
-}
-
-input[type="checkbox"],
-input[type="radio"] {
- box-sizing: border-box;
- padding: 0;
-}
-input[type="file"],
-input[type="checkbox"],
-input[type="radio"],
-select {
- margin: 0 0 1em 0;
-}
/* bootstrap overrides */
@@ -166,109 +146,7 @@ tbody {
background-color: #F7F7F7;
}
-/*form elements and buttons*/
-.btn-group {
- > .btn + .dropdown-toggle,
- > .btn:first-child,
- > .btn:last-child,
- > .dropdown-toggle {
- .border-radius(0);
- background-image: none;
- text-shadow: none;
- }
-}
-
-.btn {
- .box-shadow(none);
- .border-radius(@baseBorderRadius);
- background-image: none;
- text-shadow: none;
- background-repeat: no-repeat;
- padding: 10px;
- margin-top: 0px;
- .icon {
- margin-right: 0.2em;
- }
- &.btn-small {
- padding: 5px 10px;
- .icon {
- margin-right: 0;
- font-size: inherit;
- }
- }
- &.btn-mini {
- padding: 3px 8px;
- .icon {
- margin-right: 0;
- font-size: inherit;
- }
- }
-}
-.btn-primary {
- background: @redButton;
-}
-
-.btn-primary a:visited {
- color: #fff;
-}
-.form-actions {
- background: none;
- border: none;
-}
-
-.input-append,
-.input-prepend {
- .add-on {
- font-size: 18px;
- padding: 14px 5px 30px;
- }
- .btn .icon {
- font-size: 21.5px;
- margin-right: 0;
- }
-}
-
-.row-fluid .input-append [class*="span"],
-.input-prepend input[class*="span"] {
- width: auto;
-}
-
-.form-inline {
- input[type=password],
- input[type=text] {
- width: auto;
- }
-}
-.checkbox {
- label {
- display: inline-block;
- padding-left:25px;
- }
-}
-
-label {
- margin-right: 15px;
- padding-left:0;
- display: block;
- cursor: pointer;
- position: relative;
- font-size: 14px;
- &.inline {
- display: inline-block;
- }
-}
-.help-block {
- font-size: 12px;
-}
-
-a.help-link:hover {
- text-decoration: none;
-}
-
-input[type=text].error {
- border: red 1px solid;
-}
/**
* Fauxton-specific Bootstrap additions
@@ -297,458 +175,9 @@ table.databases {
}
}
-/* ajax loader */
-.loader {
- background: url('../img/loader.gif') center center no-repeat;
- min-height: 100px;
-}
-#app-container.loader{
- min-height: 400px;
- > *{
- display: none;
- }
-}
-
-#global-notifications {
- position: fixed;
- top: 0px;
- display: block;
- z-index: 100000;
- left: @navWidth;
- .closeMenu & {
- left: @collapsedNavWidth;
- }
- width: 100%;
-}
-
-#app-container{
- padding: 0;
- height: 100%;
- width: 100%;
- position: absolute;
- top: 0;
- left: 0;
- > .row-fluid {
- height: 100%;
- }
-}
-
-/* Fixed side navigation */
-#primary-navbar {
- /* hack for the scrollbar that shines through from the sidebar */
- -webkit-transform: translate3d(0, 0, 0);
- height: 100%;
- position: fixed;
- width: @navWidth;
- top: 0;
- bottom: 0;
- background-color: @primaryNav;
- overflow-y: scroll;
- .version {
- color: #fff;
- font-size: 10px;
- padding-left: 10px;
- }
- #footer-links{
- position: absolute;
- bottom: 0;
- width: 100%;
- }
- #user-create-admin{
- font-size: 12px
- }
- .navbar {
- .burger{
- .transition(all @transitionSpeed @transitionEaseType);
- padding: 22px 0 0 18px;
- position: fixed;
- top: 0;
- z-index: 100;
- background-color: @primaryNav;
- width: @navWidth;
- div{
- .transition(all @transitionSpeed @transitionEaseType);
- height: 4px;
- width: 24px;
- .border-radius(2);
- background-color: @navBG;
- margin: 2px 0px;
- }
- &:hover div{
- background-color: @orange;
- }
- }
- .bottom-container {
- height: 110px;
- position: fixed;
- bottom: 0;
- width: 220px;
- background: #3a2c2b;
- .brand {
- .box-sizing(content-box);
- .hide-text;
- .customTransition(left, 1s, 0.805, 0.005, 0.165, 0.985);
- margin: 10px 0 0 0;
- width: 200px;
- height: 40px;
- padding: 10px;
- float: none;
- background: #3a2c2b;
- .icon {
- .box-sizing(content-box);
- background: url(../img/couchdb-site.png) no-repeat 0 0;
- display: block;
- height: 100%;
- width: 100%;
- }
- .closeMenu & {
- .icon {
- background: url(../img/minilogo.png) no-repeat 0 0;
- }
- width: 45px;
- }
- }
- #footer-nav-links {
- li {
- a {
- font-size: 12px;
- color: @red;
- padding: 12px;
- text-shadow: none;
- }
- &.active, &:hover{
- a {
- text-decoration: underline;
- }
- }
- }
- }
- }
- nav {
- margin-top: 64px;
- .nav{
- margin: 0;
- li{
- .transition(all @transitionSpeed @transitionEaseType);
- padding: 0;
- font-size: 16px;
- letter-spacing: 1px;
- line-height: 23px;
- width: @navWidth;
- font-weight: normal;
- font-family: helvetica;
- .box-sizing(border-box);
- background-color: @navBG;
- border-bottom: 1px solid @primaryNav;
- min-height: 48px;
- &.active, &:hover{
- a{
- .box-shadow(none);
- }
- background-color: @red;
- }
- &:hover .fonticon:before{
- color: @white;
- }
- &.active .fonticon:before,
- &:hover .fonticon:before,
- {
- text-shadow: @boxShadow;
- color: @NavIconActive;
- }
- a{
- padding: 12px 25px 12px 60px;
- background-color: transparent;
- color: #fff;
- text-shadow: @textShadowOff;
- &.closeMenu{
- color: transparent;
- }
- .fonticon {
- position: relative;
- &:before {
- position: absolute;
- top: -5px;
- left: -41px;
- font-size: 24px;
- color: @NavIcon;
- text-shadow: @boxShadowOff;
- }
- }
- .closeMenu &{
- color: transparent;
- }
- }
- }
- }
- ul#footer-nav-links{
- li{
- background-color: @primaryNav;
- border-top: 1px solid @red;
- border-bottom: none;
- font-size: 12px;
- padding: 12px;
- min-height: 44px;
- &.active, &:hover{
- background-color: @linkRed;
- border-top: 1px solid @red;
- a{
- color: white;
- }
- }
- a{
- color: @red;
- }
- }
-
- }
- ul#bottom-nav-links{
- margin-top: 0;
- padding-bottom: 70px;
- li{
- min-height: 55px;
- background-color: @bottomNav;
- &.active{
- background-color:@linkRed;
- }
- &:hover{
- background-color: @navBGHover;
- }
- a{
- &.fonticon {
- position: relative;
- &:before {
- top: -5px;
- left: -40px;
- font-size: 22px;
- }
- }
- }
- }
- }
- }
- }
-}
-
-
-#dashboard {
- .box-shadow(-6px 0 rgba(0, 0, 0, 0.1));
- border-left: 1px solid #999;
- position: absolute;
- left: @navWidth;
- margin-left: 0;
- padding-left: 0;
- padding-right: 0;
- background-color: @sidebarBG;
- min-width: 600px;
- height: 100%;
- .closeMenu &{
- left: @collapsedNavWidth;
- }
- &.one-pane{
- min-width: 800px;
- margin-top: 0;
- overflow-x: hidden;
- }
-}
-
-/*dashboard content can be in multiple templates*/
-
-#dashboard-content{
- &.row-fluid,
- &.window-resizeable{
- /*remove gutter without rewriting variable*/
- margin-left: 0px;
- }
- padding: 20px;
- .with-sidebar &{
- border-left: 1px solid #999;
- border-right: 1px solid #999;
- width: auto;
- .box-shadow(-6px 0 rgba(0, 0, 0, 0.1));
- padding: 0px;
- bottom: 0px;
- top: 60px;
- position: fixed;
- overflow-x: hidden;
- overflow-y: auto;
- left: @sidebarWidth+@navWidth;
- right: 0;
- .box-sizing(border-box);
- .closeMenu & {
- left: @sidebarWidth+@collapsedNavWidth;
- }
- }
- > div.inner {
- display: block;
- }
-}
-
-.with-sidebar.content-area {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
-}
-
-// .closeMenu .with-sidebar.content-area {
-// left: 0;
-// }
-/*tools*/
-
-.row-fluid.content-area{
- background-color: @background;
-}
-
-
-.fixed-header{
- background-color: @breadcrumbBG;
- position: fixed;
- top: 0;
- right: 0;
- left: @navWidth;
- .closeMenu & {
- left: @collapsedNavWidth;
- }
- border-bottom: 5px solid @breadcrumbBorder;
- .box-shadow(0 4px 6px -2px #808080);
- z-index: 100;
- .one-pane & {
- position: relative;
- border: none;
- .box-shadow(none);
- left: auto;
- }
-}
-
-#breadcrumbs {
- .breadcrumb {
- margin: 15px 20px;
- margin-bottom: 0;
- background-color: transparent;
- padding: 0;
- li {
- .divider {
- font-size: 12px;
- color: @breadcrumbArrow;
- }
- &:first-child {
- font-size: 30px;
- }
- color: @breadcrumbText;
- font-size: 18px;
- text-shadow: none;
- &.active{
- color: #333;
- }
- a{
- color: @breadcrumbText;
- }
- }
- }
-}
-
-
-/*SIDEBAR TEMPLATE STYLES*/
-.topmenu-defaults {
- height: 70px;
- padding: 12px 10px 0;
- .box-sizing(border-box);
-}
-
-.dashboard-upper-menu{
- right: 0;
- left: @sidebarWidth+@navWidth;
- position: fixed;
- z-index: 11;
- display: block;
- .topmenu-defaults;
- background-color: #CBCBCB;
- .closeMenu & {
- left: @sidebarWidth+@collapsedNavWidth;
- }
-}
-
-#dashboard-lower-content{
- padding: 20px;
- background-color: #F1F1F1;
-}
-
-#dashboard-upper-content{
- .tab-content {
- padding-top: 70px;
- }
- .well{
- padding: 20px;
- .border-radius(0);
- .box-shadow(none);
- }
-}
-
-.sidenav {
- padding: 0;
- header {
- width: @sidebarWidth;
- border-bottom: 1px solid #d3d7db;
- }
- .nav-list{
- .divider {
- border: none;
- }
- > li > a:hover,
- > li > a:focus{
- background-color: @darkRed;
- color: #fff;
- }
- li.active > a {
- color: @darkRed;
- }
- > li > a{
- color: @linkRed;
- padding: 10px 13px 10px 24px;
- border-bottom: 1px solid #d3d7db;
- span{
- margin-right: 8px;
- width: 14px;
- display: inline-block;
- text-align: center;
- }
- }
- a{
- display: block;
- padding: 10px 5px 5px 15px;
- color: @subListGray;
- .divider {
- background: none;
- color: #ccc;
- padding: 0 2px;
- }
- }
- .nav-header{
- padding: 0px;
- text-shadow: none;
- color: #333333;
- & > span:hover {
- color: @red;
- }
- }
- }
-}
-#sidebar-content {
- position: absolute;
- top: 60px;
- width: @sidebarWidth;
- left: 0;
- background-color: @secondarySidebar;
- > div.inner {
- display: block;
- }
-}
-/*ONE PANEL TEMPLATE ONLY STYLES AKA _all_dbs */
.result-tools{
border-bottom: 1px solid #999999;
@@ -804,76 +233,7 @@ table.databases {
}
}
-.custom-inputs{
-
- input[type=radio],
- input[type=checkbox] {
- display: none;
- }
-
- .checkbox label:before {
- border-radius: 3px;
- }
-
- .controls > .radio:first-child, .controls > .checkbox:first-child {
- padding-top: 15px;
- }
-
- .radio.inline, .checkbox.inline {
- display: inline-block;
- padding-top: 15px;
- margin-bottom: 12px;
- vertical-align: middle;
- }
-
- input[type=checkbox]:checked + label:before {
- /*content: "\2713"; */
- content: "\00d7";
- text-shadow: 1px 1px 1px rgba(0, 0, 0, .2);
- font-size: 16px;
- background-color: @red;
- color: white;
- text-align: center;
- line-height: 15px;
- }
-
- label:before {
- content: "";
- display: inline-block;
- width: 16px;
- height: 16px;
-
- margin-right: 10px;
- position: absolute;
- left: 0;
- bottom: 1px;
- background-color: #aaa;
- box-shadow: inset 0px 2px 3px 0px rgba(0, 0, 0, .3), 0px 1px 0px 0px rgba(255, 255, 255, .8);
- }
-
- .radio label:before {
- border-radius: 8px;
- }
-
- input[type=radio]:checked + label:before {
- content: "\2022";
- color: #f3f3f3;
- font-size: 30px;
- text-align: center;
- line-height: 18px;
- }
-
- label.drop-down{
- &:before{
- display: none;
- }
- }
-}
-
-form.view-query-update, form.view-query-save {
- max-width: 100%;
-}
/*documents and databases */
.view.show{
@@ -986,39 +346,4 @@ div.spinner {
}
}
-div.add-dropdown {
- position: absolute;
- top: 2px;
- right: 0px;
- .dropdown-menu{
- left: -110px;
- padding-bottom: 0;
- width: 148px;
- min-width: 0;
- top: 38px;
- .box-shadow(@boxShadow);
- &.arrow:before{
- right: 4px;
- }
- a {
- background-color: #202326;
- color: rgba(255, 255, 255, 0.8);
- &:hover{
- background-color: @red;
- color: white;
- }
- }
- li a {
- padding: 10px 15px 10px 12px;
- }
- }
- .dropdown-toggle{
- border-top: none !important;
- text-decoration: none;
- }
- > a {
- border-bottom: none;
- text-decoration: none;
- font-size: 16px;
- }
-}
+
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/assets/less/formstyles.less
----------------------------------------------------------------------
diff --git a/assets/less/formstyles.less b/assets/less/formstyles.less
new file mode 100644
index 0000000..4645664
--- /dev/null
+++ b/assets/less/formstyles.less
@@ -0,0 +1,247 @@
+/* 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.
+ */
+@import "variables.less";
+
+input[type=text],
+input[type=password] {
+ .border-radius(0);
+ padding: 12px;
+ border: 1px solid #ccc;
+ height: auto;
+ font-size: 16px;
+ margin-top: 0;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+ box-sizing: border-box;
+ padding: 0;
+}
+
+input[type="file"],
+input[type="checkbox"],
+input[type="radio"],
+select {
+ margin: 0 0 1em 0;
+}
+
+/*form elements and buttons*/
+.btn-group {
+ > .btn + .dropdown-toggle,
+ > .btn:first-child,
+ > .btn:last-child,
+ > .dropdown-toggle {
+ .border-radius(0);
+ background-image: none;
+ text-shadow: none;
+ }
+}
+
+.btn {
+ .box-shadow(none);
+ .border-radius(@baseBorderRadius);
+ background-image: none;
+ text-shadow: none;
+ background-repeat: no-repeat;
+ padding: 10px;
+ margin-top: 0px;
+ .icon {
+ margin-right: 0.2em;
+ }
+ &.btn-small {
+ padding: 5px 10px;
+ .icon {
+ margin-right: 0;
+ font-size: inherit;
+ }
+ }
+ &.btn-mini {
+ padding: 3px 8px;
+ .icon {
+ margin-right: 0;
+ font-size: inherit;
+ }
+ }
+}
+.btn-primary {
+ background: @redButton;
+}
+
+.btn-primary a:visited {
+ color: #fff;
+}
+
+.form-actions {
+ background: none;
+ border: none;
+}
+
+.input-append,
+.input-prepend {
+ .add-on {
+ font-size: 18px;
+ padding: 14px 5px 30px;
+ }
+ .btn .icon {
+ font-size: 21.5px;
+ margin-right: 0;
+ }
+}
+
+.row-fluid .input-append [class*="span"],
+.input-prepend input[class*="span"] {
+ width: auto;
+}
+
+.form-inline {
+ input[type=password],
+ input[type=text] {
+ width: auto;
+ }
+}
+.checkbox {
+ label {
+ display: inline-block;
+ padding-left:25px;
+ }
+}
+
+label {
+ margin-right: 15px;
+ padding-left:0;
+ display: block;
+ cursor: pointer;
+ position: relative;
+ font-size: 14px;
+ &.inline {
+ display: inline-block;
+ }
+}
+.help-block {
+ font-size: 12px;
+}
+
+a.help-link:hover {
+ text-decoration: none;
+}
+
+input[type=text].error {
+ border: red 1px solid;
+}
+
+form.view-query-update, form.view-query-save {
+ max-width: 100%;
+}
+.custom-inputs{
+
+ input[type=radio],
+ input[type=checkbox] {
+ display: none;
+ }
+
+ .checkbox label:before {
+ border-radius: 3px;
+ }
+
+ .controls > .radio:first-child, .controls > .checkbox:first-child {
+ padding-top: 15px;
+ }
+
+ .radio.inline, .checkbox.inline {
+ display: inline-block;
+ padding-top: 15px;
+ margin-bottom: 12px;
+ vertical-align: middle;
+ }
+
+ input[type=checkbox]:checked + label:before {
+ /*content: "\2713"; */
+ content: "\00d7";
+ text-shadow: 1px 1px 1px rgba(0, 0, 0, .2);
+ font-size: 16px;
+ background-color: @red;
+ color: white;
+ text-align: center;
+ line-height: 15px;
+ }
+
+ label:before {
+ content: "";
+ display: inline-block;
+
+ width: 16px;
+ height: 16px;
+
+ margin-right: 10px;
+ position: absolute;
+ left: 0;
+ bottom: 1px;
+ background-color: #aaa;
+ box-shadow: inset 0px 2px 3px 0px rgba(0, 0, 0, .3), 0px 1px 0px 0px rgba(255, 255, 255, .8);
+ }
+
+ .radio label:before {
+ border-radius: 8px;
+ }
+
+ input[type=radio]:checked + label:before {
+ content: "\2022";
+ color: #f3f3f3;
+ font-size: 30px;
+ text-align: center;
+ line-height: 18px;
+ }
+
+ label.drop-down{
+ &:before{
+ display: none;
+ }
+ }
+}
+
+div.add-dropdown {
+ position: absolute;
+ top: 2px;
+ right: 0px;
+ .dropdown-menu{
+ left: -110px;
+ padding-bottom: 0;
+ width: 148px;
+ min-width: 0;
+ top: 38px;
+ .box-shadow(@boxShadow);
+ &.arrow:before{
+ right: 4px;
+ }
+ a {
+ background-color: #202326;
+ color: rgba(255, 255, 255, 0.8);
+ &:hover{
+ background-color: @red;
+ color: white;
+ }
+ }
+ li a {
+ padding: 10px 15px 10px 12px;
+ }
+ }
+ .dropdown-toggle{
+ border-top: none !important;
+ text-decoration: none;
+ }
+ > a {
+ border-bottom: none;
+ text-decoration: none;
+ font-size: 16px;
+ }
+}
[4/9] fauxton commit: updated refs/heads/secondary-indexes to bcc6dc2
Posted by de...@apache.org.
Fix link for new design doc
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b58f613b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b58f613b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b58f613b
Branch: refs/heads/secondary-indexes
Commit: b58f613b1ba515bcdcae1c294d6450f6f65f3b9e
Parents: ca7843b
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Thu Jul 31 20:21:00 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Thu Jul 31 20:21:00 2014 +0200
----------------------------------------------------------------------
app/addons/documents/views-sidebar.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b58f613b/app/addons/documents/views-sidebar.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-sidebar.js b/app/addons/documents/views-sidebar.js
index e3cc629..8699417 100644
--- a/app/addons/documents/views-sidebar.js
+++ b/app/addons/documents/views-sidebar.js
@@ -68,17 +68,17 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
);
var database = this.collection.database,
- newurl = "#" + database.url('app') + '/new';
+ newurlPrefix = "#" + database.url('app');
var newLinks = [{
title: 'Add new',
links: [{
title: 'New Doc',
- url: newurl,
+ url: newurlPrefix + '/new',
icon: 'fonticon-plus-circled'
},{
title: 'New Design Doc',
- url: newurl,
+ url: newurlPrefix + '/new_view',
icon: 'fonticon-plus-circled'
}]
}];
[3/9] fauxton commit: updated refs/heads/secondary-indexes to bcc6dc2
Posted by de...@apache.org.
Fauxton: Implement a filter for changes
Move the filter as a common component to Components.
- Change some <%= to <%- as <%= is not needed
- Filters can have tooltips
- Filtering is case insensitive
Closes COUCHDB-2158
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ca7843b8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ca7843b8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ca7843b8
Branch: refs/heads/secondary-indexes
Commit: ca7843b81e9dc85921cb6e612e0e2cc51ce64a98
Parents: 2ece992
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sun Jul 27 12:00:41 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Wed Jul 30 20:21:54 2014 +0200
----------------------------------------------------------------------
app/addons/documents/assets/less/changes.less | 18 ++++
app/addons/documents/routes.js | 30 +++++-
app/addons/documents/templates/changes.html | 97 ++++++++++----------
.../documents/templates/changes_header.html | 31 +++++++
app/addons/documents/tests/views-changesSpec.js | 33 ++++---
app/addons/documents/tests/viewsSpec.js | 3 +-
app/addons/documents/views-changes.js | 55 ++++++++++-
app/addons/fauxton/components.js | 43 +++++++--
app/addons/fauxton/templates/filter.html | 14 ++-
app/addons/fauxton/tests/filterViewSpec.js | 51 +++++-----
app/addons/fauxton/tests/filteredViewSpec.js | 41 +++++++++
assets/less/fauxton.less | 15 ++-
12 files changed, 316 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/app/addons/documents/assets/less/changes.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/changes.less b/app/addons/documents/assets/less/changes.less
index 43823cf..96e6d19 100644
--- a/app/addons/documents/assets/less/changes.less
+++ b/app/addons/documents/assets/less/changes.less
@@ -7,6 +7,10 @@
right: 15px;
}
+.changes-view {
+ padding-top: 70px;
+}
+
.change-wrapper {
margin-top: 20px;
border-bottom: 1px solid #dddddd;
@@ -29,3 +33,17 @@
font-weight: bold;
}
}
+
+.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;
+ }
+}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/app/addons/documents/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index 9c266be..3fd94f9 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -23,10 +23,11 @@ define([
"addons/documents/views-doceditor",
"addons/databases/base",
- "addons/documents/resources"
+ "addons/documents/resources",
+ "addons/fauxton/components"
],
-function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resources) {
+function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resources, Components) {
var DocEditorRouteObject = FauxtonAPI.RouteObject.extend({
layout: "one_pane",
@@ -163,7 +164,9 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
"route:updatePreviewDocs": "updateAllDocsFromPreview",
"route:reloadDesignDocs": "reloadDesignDocs",
"route:paginate": "paginate",
- "route:perPageChange": "perPageChange"
+ "route:perPageChange": "perPageChange",
+ "route:changesFilterAdd": "addFilter",
+ "route:changesFilterRemove": "removeFilter"
},
initialize: function (route, masterLayout, options) {
@@ -504,10 +507,17 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
var docParams = app.getParams();
this.data.database.buildChanges(docParams);
- this.documentsView = this.setView("#dashboard-lower-content", new Changes.Changes({
+ this.changesView = this.setView("#dashboard-lower-content", new Changes.Changes({
model: this.data.database
}));
+ this.filterView = new Components.FilterView({
+ eventNamespace: "changes"
+ });
+ this.headerView = this.setView("#dashboard-upper-content", new Changes.ChangesHeader({
+ filterView: this.filterView
+ }));
+
this.toolsView && this.toolsView.remove();
this.viewEditor && this.viewEditor.remove();
@@ -523,7 +533,17 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou
this.apiUrl = function() {
return [this.data.database.url("apiurl"), this.data.database.documentation()];
};
- }
+ },
+
+ addFilter: function (filter) {
+ this.changesView.filters.push(filter);
+ this.changesView.render();
+ },
+
+ 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/ca7843b8/app/addons/documents/templates/changes.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/changes.html b/app/addons/documents/templates/changes.html
index 50cc85c..a9bfbaf 100644
--- a/app/addons/documents/templates/changes.html
+++ b/app/addons/documents/templates/changes.html
@@ -11,58 +11,59 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
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 class="changes-view">
+ <% _.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="fonticon-clipboard"></i>
+ </a>
+ </div>
</div>
- <div class="span2 text-right">
- <a class="js-copy" data-clipboard-text="<%= change.seq %>" data-bypass="true" href="#">
- <i class="fonticon-clipboard"></i>
- </a>
+ <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="fonticon-clipboard"></i>
+ </a>
+ </div>
</div>
- </div>
- <div class="row-fluid">
- <div class="span2">
- id
+ <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="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="fonticon-clipboard"></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 class="js-json-container">
+ <pre class="prettyprint"><%- JSON.stringify({changes: change.changes, doc: change.doc}, null, " ") %></pre>
</div>
- <div class="span10">
- <%= change.deleted ? "True" : "False" %>
+ <div class="row-fluid">
+ <div class="span2">
+ deleted
+ </div>
+ <div class="span10">
+ <%- change.deleted ? "True" : "False" %>
+ </div>
</div>
</div>
</div>
- </div>
-<% }); %>
+ <% }); %>
+</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/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..3d6031f
--- /dev/null
+++ b/app/addons/documents/templates/changes_header.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 class="dashboard-upper-menu">
+ <ul class="nav nav-tabs window-resizeable" id="db-views-tabs-nav">
+ <li>
+ <a class="js-toggle-filter" href="#filter" data-bypass="true" data-toggle="tab">
+ <i class="fonticon fonticon-plus"></i>Filter
+ </a>
+ </li>
+ </ul>
+</div>
+
+<div class="tab-content">
+ <div class="tab-pane" id="query">
+ <div class="changes-header">
+ <div class="pull-right js-filter"></div>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/app/addons/documents/tests/views-changesSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/views-changesSpec.js b/app/addons/documents/tests/views-changesSpec.js
index 51ccb92..4d4b2b3 100644
--- a/app/addons/documents/tests/views-changesSpec.js
+++ b/app/addons/documents/tests/views-changesSpec.js
@@ -11,23 +11,30 @@
// the License.
define([
'addons/documents/views-changes',
+ 'addons/databases/base',
'testUtils'
-], function (Views, testUtils) {
- var assert = testUtils.assert,
- ViewSandbox = testUtils.ViewSandbox,
- viewSandbox;
+], function (Views, Databases, testUtils) {
+ var assert = testUtils.assert;
describe('Documents Changes', function () {
- var view;
- beforeEach(function () {
- viewSandbox = new ViewSandbox();
- viewSandbox.renderView(view);
+ var filteredView;
+ beforeEach(function () {
+ var database = new Databases.Model({id: 'bla'});
+ database.buildChanges({descending: 'true', limit: '100', include_docs: 'true'} );
+ filteredView = new Views.Changes({
+ model: database
});
+ });
- afterEach(function () {
- viewSandbox.remove();
- });
+ it('filter false in case of deleted documents in the changes feed', function () {
+ filteredView.filters = [false];
+ var res = filteredView.createFilteredData([
+ {id: 'LALA', bar: 'ENTE'},
+ {id: '1', bar: '1', deleted: true},
+ {id: '2', bar: '2'}
+ ]);
+
+ assert.equal(res.length, 2);
+ });
});
});
-
-
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/app/addons/documents/tests/viewsSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/viewsSpec.js b/app/addons/documents/tests/viewsSpec.js
index 341ed8e..639b116 100644
--- a/app/addons/documents/tests/viewsSpec.js
+++ b/app/addons/documents/tests/viewsSpec.js
@@ -11,8 +11,9 @@
// the License.
define([
'addons/documents/views',
+ 'addons/databases/base',
'testUtils'
-], function (Views, testUtils) {
+], function (Views, Databases, testUtils) {
var assert = testUtils.assert;
describe('DocumentsViews', function () {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/app/addons/documents/views-changes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-changes.js b/app/addons/documents/views-changes.js
index 2f91c21..3404346 100644
--- a/app/addons/documents/views-changes.js
+++ b/app/addons/documents/views-changes.js
@@ -16,6 +16,7 @@ define([
"api",
// Libs
"addons/fauxton/resizeColumns",
+ "addons/fauxton/components",
// Plugins
"plugins/prettify",
@@ -24,16 +25,33 @@ define([
"plugins/zeroclipboard/ZeroClipboard"
],
-function(app, FauxtonAPI, resizeColumns, prettify, ZeroClipboard) {
+function(app, FauxtonAPI, resizeColumns, Components, prettify, ZeroClipboard) {
var Views = {};
- Views.Changes = FauxtonAPI.View.extend({
+ Views.ChangesHeader = FauxtonAPI.View.extend({
+ template: "addons/documents/templates/changes_header",
+
+ events: {
+ 'click .js-toggle-filter': "toggleQuery"
+ },
+
+ toggleQuery: function (event) {
+ $('#dashboard-content').scrollTop(0);
+ this.$('#query').toggle('slow');
+ },
+
+ initialize: function () {
+ this.setView(".js-filter", this.filterView);
+ }
+ });
+
+ Views.Changes = Components.FilteredView.extend({
template: "addons/documents/templates/changes",
initialize: function () {
- this.listenTo( this.model.changes, 'sync', this.render);
- this.listenTo( this.model.changes, 'cachesync', this.render);
+ this.listenTo(this.model.changes, 'sync', this.render);
+ this.listenTo(this.model.changes, 'cachesync', this.render);
},
events: {
@@ -65,12 +83,39 @@ function(app, FauxtonAPI, resizeColumns, prettify, ZeroClipboard) {
},
serialize: function () {
+ var json = this.model.changes.toJSON(),
+ filteredData = this.createFilteredData(json);
+
return {
- changes: this.model.changes.toJSON(),
+ changes: filteredData,
database: this.model
};
},
+ createFilteredData: function (json) {
+ var that = this;
+
+ return _.reduce(this.filters, function (elements, filter) {
+
+ return _.filter(elements, function (element) {
+ var match = false;
+
+ // make deleted searchable
+ if (!element.deleted) {
+ element.deleted = false;
+ }
+ _.each(element, function (value) {
+ if (new RegExp(filter, 'i').test(value.toString())) {
+ match = true;
+ }
+ });
+ return match;
+ });
+
+
+ }, json, this);
+ },
+
afterRender: function(){
prettyPrint();
ZeroClipboard.config({ moviePath: "/assets/js/plugins/zeroclipboard/ZeroClipboard.swf" });
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index fc0f500..d77af4a 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -339,19 +339,43 @@ function(app, FauxtonAPI, ace, spin) {
}
});
+ Components.FilteredView = FauxtonAPI.View.extend({
+ filters: [],
+ createFilteredData: function (json) {
+ var that = this;
+ return _.reduce(this.filters, function (elements, filter) {
+ return _.filter(elements, function (element) {
+ var match = false;
+ _.each(element, function (value) {
+ if (new RegExp(filter, 'i').test(value.toString())) {
+ match = true;
+ }
+ });
+ return match;
+ });
+ }, json, this);
+ }
+ });
+
Components.FilterView = FauxtonAPI.View.extend({
template: "addons/fauxton/templates/filter",
initialize: function (options) {
- this.eventListener = options.eventListener;
this.eventNamespace = options.eventNamespace;
+ this.tooltipText = options.tooltipText;
},
events: {
- "submit .js-log-filter-form": "filterLogs"
+ "submit .js-filter-form": "filterItems"
},
- filterLogs: function (event) {
+ serialize: function () {
+ return {
+ tooltipText: this.tooltipText
+ };
+ },
+
+ filterItems: function (event) {
event.preventDefault();
var $filter = this.$('input[name="filter"]'),
filter = $.trim($filter.val());
@@ -360,17 +384,21 @@ function(app, FauxtonAPI, ace, spin) {
return;
}
- this.eventListener.trigger(this.eventNamespace + ":filter", filter);
+ FauxtonAPI.triggerRouteEvent(this.eventNamespace + "FilterAdd", filter);
this.insertView(".filter-list", new Components.FilterItemView({
filter: filter,
- eventListener: this.eventListener,
eventNamespace: this.eventNamespace
})).render();
$filter.val('');
- }
+ },
+ afterRender: function () {
+ if (this.tooltipText) {
+ this.$el.find(".js-filter-tooltip").tooltip();
+ }
+ }
});
Components.FilterItemView = FauxtonAPI.View.extend({
@@ -379,7 +407,6 @@ function(app, FauxtonAPI, ace, spin) {
initialize: function (options) {
this.filter = options.filter;
- this.eventListener = options.eventListener;
this.eventNamespace = options.eventNamespace;
},
@@ -396,7 +423,7 @@ function(app, FauxtonAPI, ace, spin) {
removeFilter: function (event) {
event.preventDefault();
- this.eventListener.trigger(this.eventNamespace + ":remove", this.filter);
+ FauxtonAPI.triggerRouteEvent(this.eventNamespace + "FilterRemove", this.filter);
this.remove();
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/app/addons/fauxton/templates/filter.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/filter.html b/app/addons/fauxton/templates/filter.html
index d7930fc..f7bc7c7 100644
--- a/app/addons/fauxton/templates/filter.html
+++ b/app/addons/fauxton/templates/filter.html
@@ -12,11 +12,17 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<form class="form-inline js-log-filter-form">
+<form class="form-inline js-filter-form">
<fieldset>
- <input type="text" name="filter" placeholder="Type a filter to sort the logs by">
- <button type="submit" class="btn">Filter</button>
- <span class="help-block"> <h6> Eg. debug or <1.4.1> or any regex </h6> </span>
+ <input type="text" name="filter" placeholder="Type a filter">
+ <button type="submit" class="btn btn-primary">Filter</button>
+ <div class="help-block">
+ <strong> Eg. debug or <1.4.1> or any regex </strong>
+ <% if (tooltipText) { %>
+ <i class="js-filter-tooltip icon icon-question-sign" data-toggle="tooltip"
+ title="" data-original-title="<%- tooltipText %>"></i>
+ <% } %>
+ </div>
</fieldset>
</form>
<ul class="filter-list"></ul>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/app/addons/fauxton/tests/filterViewSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/tests/filterViewSpec.js b/app/addons/fauxton/tests/filterViewSpec.js
index fec970d..1eefa05 100644
--- a/app/addons/fauxton/tests/filterViewSpec.js
+++ b/app/addons/fauxton/tests/filterViewSpec.js
@@ -17,18 +17,18 @@ define([
'api'
], function (app, Components, testUtils, FauxtonAPI) {
var assert = testUtils.assert,
- ViewSandbox = testUtils.ViewSandbox,
- myEvents = {};
-
- _.extend(myEvents, Backbone.Events);
+ ViewSandbox = testUtils.ViewSandbox;
describe('FilterView', function () {
var viewSandbox,
filterView;
+ if (!FauxtonAPI.router.triggerRouteEvent) {
+ FauxtonAPI.router.triggerRouteEvent = function () {};
+ }
+
beforeEach(function () {
filterView = new Components.FilterView({
- eventListener: myEvents,
eventNamespace: 'mynamespace'
});
@@ -40,38 +40,20 @@ define([
viewSandbox.remove();
});
- it('should trigger an event on add', function () {
- filterView.$('[name="filter"]').val('i am a lonely filter');
- myEvents.listenToOnce(myEvents, 'ente:filter', function (msg) {
- assert.equal('i am a lonely filter', msg);
- });
- filterView.$('.js-log-filter-form').submit();
- });
-
- it('should trigger an event on remove', function () {
- myEvents.listenToOnce(myEvents, 'mynamespace:filter', function (msg) {
- assert.equal('i am a lonely filter', msg);
- });
-
- filterView.$('[name="filter"]').val('i am a lonely filter');
- filterView.$('.js-log-filter-form').submit();
- filterView.$('.js-remove-filter').click();
- });
-
it('should add filter markup', function () {
filterView.$('[name="filter"]').val('i was a lonely filter');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
filterView.$('[name="filter"]').val('i am a filter');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
assert.equal(2, filterView.$('.js-remove-filter').length);
});
it('should remove filter markup', function () {
filterView.$('[name="filter"]').val('i was a lonely filter');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
filterView.$('[name="filter"]').val('i am a filter');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
filterView.$('.js-remove-filter').click();
@@ -80,8 +62,21 @@ define([
it('should not add empty filters', function () {
filterView.$('[name="filter"]').val('');
- filterView.$('.js-log-filter-form').submit();
+ filterView.$('.js-filter-form').submit();
assert.equal(0, filterView.$('.js-remove-filter').length);
});
+
+ it('should not add tooltips by default', function () {
+ assert.equal(0, filterView.$('.js-filter-tooltip').length);
+ });
+
+ it('should add tooltips when a text for it is defined', function () {
+ filterView = new Components.FilterView({
+ eventNamespace: 'mynamespace',
+ tooltipText: 'ente ente'
+ });
+ viewSandbox.renderView(filterView);
+ assert.equal(1, filterView.$('.js-filter-tooltip').length);
+ });
});
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/app/addons/fauxton/tests/filteredViewSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/tests/filteredViewSpec.js b/app/addons/fauxton/tests/filteredViewSpec.js
new file mode 100644
index 0000000..c24d439
--- /dev/null
+++ b/app/addons/fauxton/tests/filteredViewSpec.js
@@ -0,0 +1,41 @@
+// 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.
+
+define([
+ 'app',
+ 'addons/fauxton/components',
+ 'testUtils'
+], function (app, Components, testUtils) {
+ var assert = testUtils.assert;
+
+ describe('FilteredView', function () {
+ var filteredView;
+
+
+ beforeEach(function () {
+ filteredView = new Components.FilteredView();
+ });
+
+ afterEach(function () {
+ });
+
+ it('should be case insensitive', function () {
+ filteredView.filters = ['ente'];
+ var res = filteredView.createFilteredData([
+ {id: 'LALA', bar: 'ENTE'},
+ {id: '1', bar: '1', deleted: true},
+ {id: '2', bar: '2'}
+ ]);
+ assert.equal(res.length, 1);
+ });
+ });
+});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ca7843b8/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index a9ff31b..463b1e0 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -947,8 +947,8 @@ div.spinner {
.copying {
background-color: #999;
}
- .zeroclipboard-is-hover {
- background-color: #cbcbcb;
+ .zeroclipboard-is-hover {
+ background-color: #cbcbcb;
}
.icon {
vertical-align: bottom;
@@ -968,7 +968,16 @@ div.spinner {
height: 0;
}
-.js-log-filter-form {
+.js-filter-form {
+ .help-block {
+ padding: 5px 0 5px 0;
+ }
+ .icon {
+ font-size: 16px;
+ }
+}
+
+.js-filter {
ul {
margin-left: 0px;
}
[5/9] fauxton commit: updated refs/heads/secondary-indexes to bcc6dc2
Posted by de...@apache.org.
Add tests for documents/views-changes
Closes COUCHDB-2282
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/4382f43e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/4382f43e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/4382f43e
Branch: refs/heads/secondary-indexes
Commit: 4382f43efbf6ed435a3881a3b5323509fb77dc40
Parents: b58f613
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Tue Jul 29 20:04:46 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Fri Aug 1 18:17:28 2014 +0200
----------------------------------------------------------------------
app/addons/documents/tests/views-changesSpec.js | 43 +++++++++++++++++++-
1 file changed, 41 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/4382f43e/app/addons/documents/tests/views-changesSpec.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/views-changesSpec.js b/app/addons/documents/tests/views-changesSpec.js
index 4d4b2b3..94ca585 100644
--- a/app/addons/documents/tests/views-changesSpec.js
+++ b/app/addons/documents/tests/views-changesSpec.js
@@ -14,16 +14,36 @@ define([
'addons/databases/base',
'testUtils'
], function (Views, Databases, testUtils) {
- var assert = testUtils.assert;
+ var assert = testUtils.assert,
+ ViewSandbox = testUtils.ViewSandbox,
+ viewSandbox;
describe('Documents Changes', function () {
- var filteredView;
+ var model = new Databases.Model({id: 'foo'}),
+ filteredView,
+ view,
+ handlerSpy;
+
+ model.buildChanges();
+
+ handlerSpy = sinon.spy(Views.Changes.prototype, 'toggleJson');
+
beforeEach(function () {
var database = new Databases.Model({id: 'bla'});
database.buildChanges({descending: 'true', limit: '100', include_docs: 'true'} );
filteredView = new Views.Changes({
model: database
});
+
+ view = new Views.Changes({
+ model: model
+ });
+ viewSandbox = new ViewSandbox();
+ viewSandbox.renderView(view);
+ });
+
+ afterEach(function () {
+ viewSandbox.remove();
});
it('filter false in case of deleted documents in the changes feed', function () {
@@ -36,5 +56,24 @@ define([
assert.equal(res.length, 2);
});
+
+ it('the toggle-json button calls a handler', function () {
+ view.$('.js-toggle-json').trigger('click');
+ assert.ok(handlerSpy.calledOnce);
+ });
+
+ it('rerenders on the sync event', function () {
+ var spy = sinon.spy(view, 'afterRender');
+ model.changes.trigger('sync');
+ view.afterRender.restore();
+ assert.ok(spy.calledOnce);
+ });
+
+ it('rerenders on the cachesync event', function () {
+ var spy = sinon.spy(view, 'afterRender');
+ model.changes.trigger('cachesync');
+ assert.ok(spy.calledOnce);
+ view.afterRender.restore();
+ });
});
});
[2/9] fauxton commit: updated refs/heads/secondary-indexes to bcc6dc2
Posted by de...@apache.org.
Trash can aligned correnctly
Closes COUCHDB-2279
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2ece9926
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2ece9926
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2ece9926
Branch: refs/heads/secondary-indexes
Commit: 2ece99263d8dd58115066b8c82226677273db293
Parents: 5d47325
Author: Luis Gerhorst <lu...@luisgerhorst.de>
Authored: Sun Jul 27 13:12:17 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Tue Jul 29 22:55:53 2014 +0200
----------------------------------------------------------------------
app/addons/documents/assets/less/documents.less | 4 ++++
app/addons/documents/templates/code_editor.html | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2ece9926/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 13bd4fc..2b29744 100644
--- a/app/addons/documents/assets/less/documents.less
+++ b/app/addons/documents/assets/less/documents.less
@@ -94,6 +94,10 @@ button.beautify {
font-size: 16px;
}
+#doc-actions {
+ height: 42px;
+}
+
#editor-container {
width: 1316px;
height: 688px;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2ece9926/app/addons/documents/templates/code_editor.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/code_editor.html b/app/addons/documents/templates/code_editor.html
index 76d37ef..977bacf 100644
--- a/app/addons/documents/templates/code_editor.html
+++ b/app/addons/documents/templates/code_editor.html
@@ -15,7 +15,7 @@ the License.
<div id="doc">
<div class="errors-container"></div>
-<div class="nav">
+<div id="doc-actions" class="nav">
<div class="span3">
<button class="save-doc btn btn-success save" type="button"><i class="icon fonticon-ok-circled"></i> Save</button>
<button class="btn cancel-button">Back to _all_docs</button>
@@ -42,11 +42,9 @@ the License.
<% } %>
<button class="btn upload"><i class="icon icon-circle-arrow-up"></i> Upload Attachment</button>
<button class="btn duplicate"><i class="icon icon-repeat"></i> Clone document</button>
+ <button class="btn btn-danger delete"><i class="icon icon-trash"></i></button>
</div>
- <button class="btn btn-danger delete"><i class="icon icon-trash"></i></button>
- </ul>
-
<div id="upload-modal"> </div>
<div id="duplicate-modal"> </div>
<div id="string-edit-modal"> </div>
[7/9] buncha editor stuff making the preview page look less butts.
Styling the view form documents This stuff can't be tables. Boo. less for
indexes resize stuff And more refactor stuff View editor updates,
Splitting out less files An absolute abortion h
Posted by de...@apache.org.
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/assets/less/templates.less
----------------------------------------------------------------------
diff --git a/assets/less/templates.less b/assets/less/templates.less
new file mode 100644
index 0000000..7473287
--- /dev/null
+++ b/assets/less/templates.less
@@ -0,0 +1,517 @@
+/* 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.
+ */
+ @import "variables.less";
+
+/* ajax loader */
+.loader {
+ background: url('../img/loader.gif') center center no-repeat;
+ min-height: 100px;
+}
+
+#global-notifications {
+ position: fixed;
+ top: 0px;
+ display: block;
+ z-index: 100000;
+ left: @navWidth;
+ .closeMenu & {
+ left: @collapsedNavWidth;
+ }
+ width: 100%;
+}
+
+/*container where the layout is injected*/
+#app-container{
+ padding: 0;
+ height: 100%;
+ width: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ > .row-fluid {
+ height: 100%;
+ }
+ &.loader{
+ min-height: 400px;
+ > *{
+ display: none;
+ }
+ }
+}
+
+/* Fixed side navigation */
+#primary-navbar {
+ /* hack for the scrollbar that shines through from the sidebar */
+ -webkit-transform: translate3d(0, 0, 0);
+ height: 100%;
+ position: fixed;
+ width: @navWidth;
+ top: 0;
+ bottom: 0;
+ background-color: @primaryNav;
+ overflow-y: scroll;
+ .version {
+ color: #fff;
+ font-size: 10px;
+ padding-left: 10px;
+ }
+ #footer-links{
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ }
+ #user-create-admin{
+ font-size: 12px
+ }
+ .navbar {
+ .burger{
+ .transition(all @transitionSpeed @transitionEaseType);
+ padding: 22px 0 0 18px;
+ position: fixed;
+ top: 0;
+ z-index: 100;
+ background-color: @primaryNav;
+ width: @navWidth;
+ div{
+ .transition(all @transitionSpeed @transitionEaseType);
+ height: 4px;
+ width: 24px;
+ .border-radius(2);
+ background-color: @navBG;
+ margin: 2px 0px;
+ }
+ &:hover div{
+ background-color: @orange;
+ }
+ }
+ .bottom-container {
+ height: 110px;
+ position: fixed;
+ bottom: 0;
+ width: 220px;
+ background: #3a2c2b;
+ .brand {
+ .box-sizing(content-box);
+ .hide-text;
+ .customTransition(left, 1s, 0.805, 0.005, 0.165, 0.985);
+ margin: 10px 0 0 0;
+ width: 200px;
+ height: 40px;
+ padding: 10px;
+ float: none;
+ background: #3a2c2b;
+ .icon {
+ .box-sizing(content-box);
+ background: url(../img/couchdb-site.png) no-repeat 0 0;
+ display: block;
+ height: 100%;
+ width: 100%;
+ }
+ .closeMenu & {
+ .icon {
+ background: url(../img/minilogo.png) no-repeat 0 0;
+ }
+ width: 45px;
+ }
+ }
+ #footer-nav-links {
+ li {
+ a {
+ font-size: 12px;
+ color: @red;
+ padding: 12px;
+ text-shadow: none;
+ }
+ &.active, &:hover{
+ a {
+ text-decoration: underline;
+ }
+ }
+ }
+ }
+ }
+ nav {
+ margin-top: 64px;
+ .nav{
+ margin: 0;
+ li{
+ .transition(all @transitionSpeed @transitionEaseType);
+ padding: 0;
+ font-size: 16px;
+ letter-spacing: 1px;
+ line-height: 23px;
+ width: @navWidth;
+ font-weight: normal;
+ font-family: helvetica;
+ .box-sizing(border-box);
+ background-color: @navBG;
+ border-bottom: 1px solid @primaryNav;
+ min-height: 48px;
+ &.active, &:hover{
+ a{
+ .box-shadow(none);
+ }
+ background-color: @red;
+ }
+ &:hover .fonticon:before{
+ color: @white;
+ }
+ &.active .fonticon:before,
+ &:hover .fonticon:before,
+ {
+ text-shadow: @boxShadow;
+ color: @NavIconActive;
+ }
+ a{
+ padding: 12px 25px 12px 60px;
+ background-color: transparent;
+ color: #fff;
+ text-shadow: @textShadowOff;
+ &.closeMenu{
+ color: transparent;
+ }
+ .fonticon {
+ position: relative;
+ &:before {
+ position: absolute;
+ top: -5px;
+ left: -41px;
+ font-size: 24px;
+ color: @NavIcon;
+ text-shadow: @boxShadowOff;
+ }
+ }
+ .closeMenu &{
+ color: transparent;
+ }
+ }
+ }
+ }
+ ul#footer-nav-links{
+ li{
+ background-color: @primaryNav;
+ border-top: 1px solid @red;
+ border-bottom: none;
+ font-size: 12px;
+ padding: 12px;
+ min-height: 44px;
+ &.active, &:hover{
+ background-color: @linkRed;
+ border-top: 1px solid @red;
+ a{
+ color: white;
+ }
+ }
+ a{
+ color: @red;
+ }
+ }
+
+ }
+ ul#bottom-nav-links{
+ margin-top: 0;
+ padding-bottom: 70px;
+ li{
+ min-height: 55px;
+ background-color: @bottomNav;
+ &.active{
+ background-color:@linkRed;
+ }
+ &:hover{
+ background-color: @navBGHover;
+ }
+ a{
+ &.fonticon {
+ position: relative;
+ &:before {
+ top: -5px;
+ left: -40px;
+ font-size: 22px;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+/*
+
+ FIXED HEADER, DASHBOARD & BREADCRUMBS:
+
+ one_pane.html
+ two_pane.html
+ with_sidebar.html
+ with_tabs.html
+ with_tabs_sidebar.html
+*/
+#dashboard {
+ .box-shadow(-6px 0 rgba(0, 0, 0, 0.1));
+ border-left: 1px solid #999;
+ position: absolute;
+ left: @navWidth;
+ margin-left: 0;
+ padding-left: 0;
+ padding-right: 0;
+ background-color: @sidebarBG;
+ min-width: 600px;
+ height: 100%;
+ .closeMenu &{
+ left: @collapsedNavWidth;
+ }
+ &.one-pane{
+ min-width: 800px;
+ margin-top: 0;
+ overflow-x: hidden;
+ }
+ &.two-pane{
+ margin-top: 0;
+ overflow-x: hidden;
+ }
+}
+
+.fixed-header{
+ height: 60px;
+ background-color: @breadcrumbBG;
+ position: fixed;
+ top: 0;
+ right: 0;
+ left: @navWidth;
+ .closeMenu & {
+ left: @collapsedNavWidth;
+ }
+ border-bottom: 5px solid @breadcrumbBorder;
+ .box-shadow(0 4px 6px -2px #808080);
+ z-index: 100;
+ .one-pane & {
+ position: relative;
+ border: none;
+ .box-shadow(none);
+ left: auto;
+ }
+}
+
+#breadcrumbs {
+ .breadcrumb {
+ margin: 15px 20px;
+ margin-bottom: 0;
+ background-color: transparent;
+ padding: 0;
+ li {
+ .divider {
+ font-size: 12px;
+ color: @breadcrumbArrow;
+ }
+ &:first-child {
+ font-size: 30px;
+ }
+ color: @breadcrumbText;
+ font-size: 18px;
+ text-shadow: none;
+ &.active{
+ color: #333;
+ }
+ a{
+ color: @breadcrumbText;
+ }
+ }
+ }
+}
+
+
+/* SIDEBAR-CONTENT & DASHBOARD-CONTENT LAYOUTS:
+ with_sidebar.html
+ with_tabs_sidebar.html
+*/
+
+#sidebar-content {
+ position: absolute;
+ top: 60px;
+ width: @sidebarWidth;
+ left: 0;
+ background-color: @secondarySidebar;
+ > div.inner {
+ display: block;
+ }
+}
+
+.topmenu-defaults {
+ height: 70px;
+ padding: 12px 10px 0;
+ .box-sizing(border-box);
+}
+
+/* USED IN TEMPLATE: with_tabs_sidebar.html */
+.dashboard-upper-menu{
+ right: 0;
+ left: @sidebarWidth+@navWidth;
+ position: fixed;
+ z-index: 11;
+ display: block;
+ .topmenu-defaults;
+ background-color: #CBCBCB;
+ .closeMenu & {
+ left: @sidebarWidth+@collapsedNavWidth;
+ }
+}
+
+#dashboard-lower-content{
+ padding: 20px;
+ background-color: #F1F1F1;
+}
+
+#dashboard-upper-content{
+ .tab-content {
+ padding-top: 70px;
+ }
+ .well{
+ padding: 20px;
+ .border-radius(0);
+ .box-shadow(none);
+ }
+}
+
+#dashboard-content{
+ &.row-fluid,
+ &.window-resizeable{
+ /*remove gutter without rewriting variable*/
+ margin-left: 0px;
+ }
+ padding: 20px;
+ .with-sidebar &{
+ border-left: 1px solid #999;
+ border-right: 1px solid #999;
+ width: auto;
+ .box-shadow(-6px 0 rgba(0, 0, 0, 0.1));
+ padding: 0px;
+ bottom: 0px;
+ top: 60px;
+ position: fixed;
+ overflow-x: hidden;
+ overflow-y: auto;
+ left: @sidebarWidth+@navWidth;
+ right: 0;
+ .box-sizing(border-box);
+ .closeMenu & {
+ left: @sidebarWidth+@collapsedNavWidth;
+ }
+ }
+ > div.inner {
+ display: block;
+ }
+}
+
+/*
+ Sidenav:
+ USED IN DOCUMENT ADDON & EXTERNAL ADDONS
+*/
+.sidenav {
+ padding: 0;
+ header {
+ width: @sidebarWidth;
+ border-bottom: 1px solid #d3d7db;
+ }
+ .nav-list{
+ .divider {
+ border: none;
+ }
+ > li > a:hover,
+ > li > a:focus{
+ background-color: @darkRed;
+ color: #fff;
+ }
+ li.active > a {
+ color: @darkRed;
+ }
+ > li > a{
+ color: @linkRed;
+ padding: 10px 13px 10px 24px;
+ border-bottom: 1px solid #d3d7db;
+ span{
+ margin-right: 8px;
+ width: 14px;
+ display: inline-block;
+ text-align: center;
+ }
+ }
+ a{
+ display: block;
+ padding: 10px 5px 5px 15px;
+ color: @subListGray;
+ .divider {
+ background: none;
+ color: #ccc;
+ padding: 0 2px;
+ }
+ }
+ .nav-header{
+ padding: 0px;
+ text-shadow: none;
+ color: #333333;
+ & > span:hover {
+ color: @red;
+ }
+ }
+ }
+}
+
+.row-fluid.content-area{
+ background-color: @background;
+}
+
+
+/*
+ #left-content & #right-content from template:
+ two_pane.html
+*/
+#left-content,
+#right-content{
+ .two-pane &{
+ padding: 0px;
+ bottom: 0px;
+ top: 60px;
+ margin-left:0;
+ position: fixed;
+ overflow-x: hidden;
+ overflow-y: auto;
+ .box-sizing(border-box);
+ }
+}
+
+#left-content{
+ .two-pane &{
+ left: @navWidth;
+ .closeMenu & {
+ left: @collapsedNavWidth;
+ }
+ }
+}
+#right-content{
+ .two-pane &{
+ padding: 0 20px;
+ border-left: 1px solid #999;
+ .box-shadow(-6px 0 rgba(0, 0, 0, 0.1));
+ }
+}
+
+
+
+.with-sidebar.content-area,
+.two-pane.content-area {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bcc6dc21/settings.json.default
----------------------------------------------------------------------
diff --git a/settings.json.default b/settings.json.default
index bc5a617..d278368 100644
--- a/settings.json.default
+++ b/settings.json.default
@@ -3,6 +3,7 @@
{ "name": "fauxton" },
{ "name": "databases" },
{ "name": "documents" },
+ { "name": "indexes" },
{ "name": "pouchdb" },
{ "name": "activetasks" },
{ "name": "config" },
[6/9] fauxton commit: updated refs/heads/secondary-indexes to bcc6dc2
Posted by de...@apache.org.
Link local docs in Fauxton
Instead of linking to the latest version online, we link to the
docs for the locally installed version. The docs are
generated automatically when running make / make install, if you
have Sphinx installed. For development, the dev-server will just
proxy the request.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/07945ecf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/07945ecf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/07945ecf
Branch: refs/heads/secondary-indexes
Commit: 07945ecfacb57c9a0d31f07708e08018e265f49a
Parents: 4382f43
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sat Aug 2 17:24:51 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Sat Aug 2 17:24:51 2014 +0200
----------------------------------------------------------------------
.../templates/design_doc_selector.html | 2 +-
app/addons/documents/templates/view_editor.html | 6 ++--
app/addons/fauxton/templates/api_bar.html | 2 +-
app/addons/fauxton/templates/nav_bar.html | 2 +-
app/addons/permissions/templates/section.html | 2 +-
app/addons/replication/templates/form.html | 2 +-
app/helpers.js | 31 ++++++++++----------
tasks/couchserver.js | 7 +++--
8 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/app/addons/documents/templates/design_doc_selector.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/design_doc_selector.html b/app/addons/documents/templates/design_doc_selector.html
index 828b5a5..d12cd64 100644
--- a/app/addons/documents/templates/design_doc_selector.html
+++ b/app/addons/documents/templates/design_doc_selector.html
@@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under
the License.
-->
<div class="span3">
- <label for="ddoc">Save to Design Document <a class="help-link" href="<%-getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <label for="ddoc">Save to Design Document <a class="help-link" data-bypass="true" href="<%-getDocUrl('design_doc')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<select id="ddoc">
<optgroup label="Select a document">
<option value="new-doc">New document</option>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/app/addons/documents/templates/view_editor.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/view_editor.html b/app/addons/documents/templates/view_editor.html
index e6fbbc1..769deed 100644
--- a/app/addons/documents/templates/view_editor.html
+++ b/app/addons/documents/templates/view_editor.html
@@ -35,13 +35,13 @@ the License.
</div>
<div class="control-group">
- <label for="index-name">Index name <a class="help-link" href="<%-getDocUrl('view_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <label for="index-name">Index name <a class="help-link" data-bypass="true" href="<%-getDocUrl('view_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<input type="text" id="index-name" value="<%- viewName %>" placeholder="Index name" />
</div>
<div class="control-group">
- <label for="map-function">Map function <a class="help-link" href="<%-getDocUrl('map_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <label for="map-function">Map function <a class="help-link" data-bypass="true" href="<%-getDocUrl('map_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<% if (newView) { %>
<div class="js-editor" id="map-function"><%= langTemplates.map %></div>
<% } else { %>
@@ -52,7 +52,7 @@ the License.
<div class="control-group">
- <label for="reduce-function-selector">Reduce (optional) <a class="help-link" href="<%-getDocUrl('reduce_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
+ <label for="reduce-function-selector">Reduce (optional) <a class="help-link" data-bypass="true" href="<%-getDocUrl('reduce_functions')%>" target="_blank"><i class="icon-question-sign"></i></a></label>
<select id="reduce-function-selector">
<option value="" <%- !reduceFunStr ? 'selected="selected"' : '' %>>None</option>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/app/addons/fauxton/templates/api_bar.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/api_bar.html b/app/addons/fauxton/templates/api_bar.html
index 773ccbd..f56741c 100644
--- a/app/addons/fauxton/templates/api_bar.html
+++ b/app/addons/fauxton/templates/api_bar.html
@@ -21,7 +21,7 @@ the License.
<div class="input-prepend input-append">
<span class="add-on">
API URL
- <a class="help-link" href="<%-getDocUrl(documentation)%>" target="_blank">
+ <a class="help-link" data-bypass="true" href="<%-getDocUrl(documentation)%>" target="_blank">
<i class="icon-question-sign"></i>
</a>
</span>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/app/addons/fauxton/templates/nav_bar.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/nav_bar.html b/app/addons/fauxton/templates/nav_bar.html
index 3de8a80..f33399d 100644
--- a/app/addons/fauxton/templates/nav_bar.html
+++ b/app/addons/fauxton/templates/nav_bar.html
@@ -34,7 +34,7 @@ the License.
<div id="bottom-nav">
<ul id="bottom-nav-links" class="nav">
<li data-nav-name= "Documentation">
- <a href="<%-getDocUrl('docs')%>" target="_blank">
+ <a data-bypass="true" href="<%-getDocUrl('docs')%>" target="_blank">
<i class="fonticon-bookmark fonticon"></i>
Documentation
</a>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/app/addons/permissions/templates/section.html
----------------------------------------------------------------------
diff --git a/app/addons/permissions/templates/section.html b/app/addons/permissions/templates/section.html
index 6b54185..a320c90 100644
--- a/app/addons/permissions/templates/section.html
+++ b/app/addons/permissions/templates/section.html
@@ -13,7 +13,7 @@ the License.
-->
<header class="page-header">
<h3> <%- section %> </h3>
-<p class="help"> <%- help %> <a class="help-link" href="<%-getDocUrl('database_permission')%>" target="_blank"><i class="icon-question-sign"> </i> </a></p>
+<p class="help"> <%- help %> <a class="help-link" data-bypass="true" href="<%-getDocUrl('database_permission')%>" target="_blank"><i class="icon-question-sign"> </i> </a></p>
</header>
<div class="row-fluid">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/app/addons/replication/templates/form.html
----------------------------------------------------------------------
diff --git a/app/addons/replication/templates/form.html b/app/addons/replication/templates/form.html
index 99e2d3d..e354bc0 100644
--- a/app/addons/replication/templates/form.html
+++ b/app/addons/replication/templates/form.html
@@ -63,7 +63,7 @@ the License.
<label for="createTarget">
<input type="checkbox" name="create_target" value="true" id="createTarget">
- Create Target <a class="help-link" href="<%-getDocUrl('replication_doc')%>" target="_blank"><i class="icon-question-sign" rel="tooltip" title="Create the target database"></i></a>
+ Create Target <a class="help-link" data-bypass="true" href="<%-getDocUrl('replication_doc')%>" target="_blank"><i class="icon-question-sign" rel="tooltip" title="Create the target database"></i></a>
</label>
</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/app/helpers.js
----------------------------------------------------------------------
diff --git a/app/helpers.js b/app/helpers.js
index 208b0d9..6fa8481 100644
--- a/app/helpers.js
+++ b/app/helpers.js
@@ -36,25 +36,24 @@ function(utils, d3) {
return path;
};
-
// Get the URL for documentation, wiki, wherever we store it.
// update the URLs in documentation_urls.js
Helpers.docs = {
- "docs": "http://docs.couchdb.org/en/latest/intro/api.html#documents",
- "all_dbs": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=all_dbs#get--_all_dbs",
- "replication_doc": "http://docs.couchdb.org/en/latest/replication/replicator.html#basics",
- "design_doc": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#design-docs",
- "view_functions": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#view-functions",
- "map_functions": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#map-functions",
- "reduce_functions": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#reduce-and-rereduce-functions",
- "api_reference": "http://docs.couchdb.org/en/latest/http-api.html",
- "database_permission": "http://docs.couchdb.org/en/latest/api/database/security.html#db-security",
- "stats": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=stats#get--_stats",
- "_active_tasks": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=stats#active-tasks",
- "log": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=stats#log",
- "config": "http://docs.couchdb.org/en/latest/config/index.html",
- "views": "http://docs.couchdb.org/en/latest/intro/overview.html#views",
- "changes": "http://docs.couchdb.org/en/latest/api/database/changes.html?highlight=changes#post--db-_changes"
+ "docs": "/_utils/docs/intro/api.html#documents",
+ "all_dbs": "/_utils/docs/api/server/common.html?highlight=all_dbs#get--_all_dbs",
+ "replication_doc": "/_utils/docs/replication/replicator.html#basics",
+ "design_doc": "/_utils/docs/couchapp/ddocs.html#design-docs",
+ "view_functions": "/_utils/docs/couchapp/ddocs.html#view-functions",
+ "map_functions": "/_utils/docs/couchapp/ddocs.html#map-functions",
+ "reduce_functions": "/_utils/docs/couchapp/ddocs.html#reduce-and-rereduce-functions",
+ "api_reference": "/_utils/docs/http-api.html",
+ "database_permission": "/_utils/docs/api/database/security.html#db-security",
+ "stats": "/_utils/docs/api/server/common.html?highlight=stats#get--_stats",
+ "_active_tasks": "/_utils/docs/api/server/common.html?highlight=stats#active-tasks",
+ "log": "/_utils/docs/api/server/common.html?highlight=stats#log",
+ "config": "/_utils/docs/config/index.html",
+ "views": "/_utils/docs/intro/overview.html#views",
+ "changes": "/_utils/docs/api/database/changes.html?highlight=changes#post--db-_changes"
};
Helpers.getDocUrl = function(docKey){
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/07945ecf/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/tasks/couchserver.js b/tasks/couchserver.js
index b12e8c2..45a4f9c 100644
--- a/tasks/couchserver.js
+++ b/tasks/couchserver.js
@@ -64,9 +64,6 @@ module.exports = function (grunt) {
} else if (!!url.match(/\.css|img/)) {
url = url.replace(/\?.*/, '');
filePath = path.join(dist_dir,url);
- /*} else if (!!url.match(/\/js\//)) {
- // serve any javascript or files from dist debug dir
- filePath = path.join(dist_dir,req.url);*/
} else if (!!url.match(/\.js$|\.html$/)) {
// server js from app directory
filePath = path.join(app_dir, url.replace('/_utils/fauxton/',''));
@@ -80,6 +77,10 @@ module.exports = function (grunt) {
filePath = path.join(dist_dir, 'index.html');
};
+ if (/_utils\/docs/.test(filePath)) {
+ filePath = false;
+ }
+
if (filePath) {
return send(req, filePath)
.on('error', function (err) {