couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject [10/26] fauxton commit: updated refs/heads/secondary-indexes to 7a446d8
Date Wed, 06 Aug 2014 19:31:17 GMT
Add all the indexes to the sidebar
Fix sidebar to work with different indexes
Added the apache license
changed a comment ffs.


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

Branch: refs/heads/secondary-indexes
Commit: b2d6d7c9663ee07c91410e70635157824c649dc0
Parents: 2ad683c
Author: deathbearbrown <deathbearbrown@gmail.com>
Authored: Tue Jul 29 09:10:42 2014 -0400
Committer: deathbearbrown <deathbearbrown@gmail.com>
Committed: Wed Aug 6 12:24:46 2014 -0400

----------------------------------------------------------------------
 .../documents/assets/less/advancedOptions.less  |  2 +-
 app/addons/documents/views-sidebar.js           |  2 +-
 app/addons/indexes/less/indexes.less            | 13 ++++++
 .../indexes/less/new-index-placeholder.less     |  3 ++
 app/addons/indexes/routes-filter.js             | 47 --------------------
 app/addons/indexes/templates/index_editor.html  | 18 ++++++++
 .../indexes/templates/new_placeholder.html      | 16 +++++++
 7 files changed, 52 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2d6d7c9/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 b68dfd5..84851fd 100644
--- a/app/addons/documents/assets/less/advancedOptions.less
+++ b/app/addons/documents/assets/less/advancedOptions.less
@@ -91,4 +91,4 @@
 }
 #button-options {
   margin-top: 20px;
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2d6d7c9/app/addons/documents/views-sidebar.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-sidebar.js b/app/addons/documents/views-sidebar.js
index 63837e9..7ebe99a 100644
--- a/app/addons/documents/views-sidebar.js
+++ b/app/addons/documents/views-sidebar.js
@@ -175,7 +175,7 @@ function(app, FauxtonAPI, Components, Documents, Databases) {
 
         menuLinks.push({
           title: link.title,
-          url: "#" + database.url('app') + "/" + link.url + "/" + docSafe,
+          url: "#" + database.url('app') + "/_design/" + docSafe + "/" + link.url,
           icon: 'fonticon-plus-circled'
         });
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2d6d7c9/app/addons/indexes/less/indexes.less
----------------------------------------------------------------------
diff --git a/app/addons/indexes/less/indexes.less b/app/addons/indexes/less/indexes.less
new file mode 100644
index 0000000..d526ee9
--- /dev/null
+++ b/app/addons/indexes/less/indexes.less
@@ -0,0 +1,13 @@
+// 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 "new-index-placeholder.less";

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2d6d7c9/app/addons/indexes/less/new-index-placeholder.less
----------------------------------------------------------------------
diff --git a/app/addons/indexes/less/new-index-placeholder.less b/app/addons/indexes/less/new-index-placeholder.less
new file mode 100644
index 0000000..3f5db0e
--- /dev/null
+++ b/app/addons/indexes/less/new-index-placeholder.less
@@ -0,0 +1,3 @@
+.watermark-logo {
+  background: transparent url(../img/couchWatermark.png') no-repeat 0 0;
+}

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2d6d7c9/app/addons/indexes/routes-filter.js
----------------------------------------------------------------------
diff --git a/app/addons/indexes/routes-filter.js b/app/addons/indexes/routes-filter.js
deleted file mode 100644
index 492b014..0000000
--- a/app/addons/indexes/routes-filter.js
+++ /dev/null
@@ -1,47 +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/databases/base",
-  "addons/indexes/views",
-  "addons/documents/views",
-  "addons/indexes/resources"
-],
-
-function (app, FauxtonAPI, Databases, Views, Documents, Resources) {
-
-  var FilterIndexes = FauxtonAPI.RouteObject.extend({
-    layout: "two_pane",
-    routes: {
-      "database/:database/_design/:ddoc/_filters/:fn": {
-        route: "tempFn",
-        roles: ['_admin']
-      },
-      "database/:database/new_filter": "newFilterEditor",
-      "database/:database/new_filter/:designDoc": "newFilterEditor"
-    },
-    newFilterEditor: function(){
-      return false;
-    },
-    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)},
-        ];
-      };
-    }
-  });
-
-  return FilterIndexes;
-});

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2d6d7c9/app/addons/indexes/templates/index_editor.html
----------------------------------------------------------------------
diff --git a/app/addons/indexes/templates/index_editor.html b/app/addons/indexes/templates/index_editor.html
new file mode 100644
index 0000000..8644909
--- /dev/null
+++ b/app/addons/indexes/templates/index_editor.html
@@ -0,0 +1,18 @@
+<!--
+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.
+-->
+
+<form>
+  <label> A FORM</label>
+
+</form>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b2d6d7c9/app/addons/indexes/templates/new_placeholder.html
----------------------------------------------------------------------
diff --git a/app/addons/indexes/templates/new_placeholder.html b/app/addons/indexes/templates/new_placeholder.html
new file mode 100644
index 0000000..1fcf6d9
--- /dev/null
+++ b/app/addons/indexes/templates/new_placeholder.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 <a href="#/preview" class="btn btn-success save"> Preview</a> To
query result</p>


Mime
View raw message