diff options
author | Russell Branca <chewbranca@gmail.com> | 2013-03-12 16:25:28 -0700 |
---|---|---|
committer | Russell Branca <chewbranca@gmail.com> | 2013-03-12 16:26:19 -0700 |
commit | f0b587c41c7ed777328827d06dc5a91521468c82 (patch) | |
tree | 6f61dbc50a37cf471dbed43b97aa37968f891f0d | |
parent | b18aa31b75f09e31028a97a74dffd81fc0b5667a (diff) | |
download | couchdb-f0b587c41c7ed777328827d06dc5a91521468c82.tar.gz |
Cleanup some broken things on documents
-rw-r--r-- | src/fauxton/app/modules/documents/routes.js | 6 | ||||
-rw-r--r-- | src/fauxton/app/templates/documents/all_docs_list.html | 2 | ||||
-rw-r--r-- | src/fauxton/app/templates/documents/tabs.html | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/fauxton/app/modules/documents/routes.js b/src/fauxton/app/modules/documents/routes.js index d5dfc6a74..34b00d846 100644 --- a/src/fauxton/app/modules/documents/routes.js +++ b/src/fauxton/app/modules/documents/routes.js @@ -209,6 +209,10 @@ function(app, FauxtonAPI, Documents, Databases) { "database/:database/:doc/code_editor": codeEditorCallback, "database/:database/:doc": codeEditorCallback, + "database/:database/_design%2F:doc": function(database, doc) { + var docID = "_design/"+doc; + return codeEditorCallback(database, docID); + }, // HACK // The ordering of routes is different in this object that the @@ -268,7 +272,7 @@ function(app, FauxtonAPI, Documents, Databases) { }; }, - "database/:database/_:handler": function(databaseName, page) { + "database/:database/_all_docs(:extra)": function(databaseName, page) { var data = { database: new Databases.Model({id:databaseName}) }; diff --git a/src/fauxton/app/templates/documents/all_docs_list.html b/src/fauxton/app/templates/documents/all_docs_list.html index 423a80d03..2f63af038 100644 --- a/src/fauxton/app/templates/documents/all_docs_list.html +++ b/src/fauxton/app/templates/documents/all_docs_list.html @@ -19,10 +19,12 @@ the License. <button type="button" class="btn all" data-toggle="button">✓ All</button> <button class="btn btn-small disabled bulk-delete"><i class="icon-trash"></i></button> </div> + <!-- TODO::REENABLE <div class="btn-toolbar pull-right"> <a href="#new-view-index" class="btn btn-small toggle-edit disabled"><i class="icon-wrench"></i> Edit index</a> <a href="#params" class="btn btn-small toggle-params"><i class="icon-plus"></i> API preview</a> </div> + --> </div> <% } %> diff --git a/src/fauxton/app/templates/documents/tabs.html b/src/fauxton/app/templates/documents/tabs.html index bf2968e0c..57e6cb180 100644 --- a/src/fauxton/app/templates/documents/tabs.html +++ b/src/fauxton/app/templates/documents/tabs.html @@ -14,11 +14,14 @@ the License. <ul class="nav nav-tabs"> <li class="active"><a href="<%= db_url %>">Docs</a></li> + <!-- TODO::REENABLE <li><a href="#">Permissions</a></li> <li><a href="#">Stats</a></li> + --> <li id="changes"><a href="<%= changes_url %>">Changes</a></li> + <!-- TODO::REENABLE <div id="search" class="navbar-search span4 nav pull-right input-prepend" style="height:20px;"></div> - <!-- TODO: put this styling into less --> + <!-- TODO: put this styling into less --//> <ul class="nav pull-right" style="margin:5px 10px 0px 10px;"> <li> <div class="btn-group"> @@ -32,4 +35,5 @@ the License. </div> </li> </ul> + --> </ul> |