Cleanup some broken things on documents
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7a4a60c4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7a4a60c4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7a4a60c4 Branch: refs/heads/fauxton-rebase Commit: 7a4a60c44bf4b1fbc2687e9ce64d06355f5c22e2 Parents: 586b8ef Author: Russell Branca <chewbra...@gmail.com> Authored: Tue Mar 12 16:25:28 2013 -0700 Committer: Russell Branca <chewbra...@gmail.com> Committed: Fri Mar 15 14:37:34 2013 -0700 ---------------------------------------------------------------------- src/fauxton/app/modules/documents/routes.js | 6 +++++- .../app/templates/documents/all_docs_list.html | 2 ++ src/fauxton/app/templates/documents/tabs.html | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/7a4a60c4/src/fauxton/app/modules/documents/routes.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/modules/documents/routes.js b/src/fauxton/app/modules/documents/routes.js index d5dfc6a..34b00d8 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}) }; http://git-wip-us.apache.org/repos/asf/couchdb/blob/7a4a60c4/src/fauxton/app/templates/documents/all_docs_list.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/all_docs_list.html b/src/fauxton/app/templates/documents/all_docs_list.html index 423a80d..2f63af0 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> <% } %> http://git-wip-us.apache.org/repos/asf/couchdb/blob/7a4a60c4/src/fauxton/app/templates/documents/tabs.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/documents/tabs.html b/src/fauxton/app/templates/documents/tabs.html index bf2968e..57e6cb1 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>
