Improve sidebar list of index types
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/84440ec6 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/84440ec6 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/84440ec6 Branch: refs/heads/sidebar-fixes Commit: 84440ec6e3ae0ec1ccad217ca2c9468b70c69db1 Parents: 77d6433 Author: Garren Smith <[email protected]> Authored: Wed Aug 13 14:42:22 2014 +0200 Committer: Garren Smith <[email protected]> Committed: Mon Aug 18 11:36:09 2014 +0200 ---------------------------------------------------------------------- app/addons/documents/routes.js | 2 +- .../documents/templates/design_doc_menu.html | 2 +- .../documents/templates/index_menu_item.html | 4 ++-- app/addons/documents/views-sidebar.js | 25 ++++++++++++-------- 4 files changed, 19 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84440ec6/app/addons/documents/routes.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js index c5287e7..8eca7f6 100644 --- a/app/addons/documents/routes.js +++ b/app/addons/documents/routes.js @@ -134,7 +134,7 @@ function(app, FauxtonAPI, Documents, Changes, Index, DocEditor, Databases, Resou route: "allDocs", roles: ["_reader","_writer","_admin"] }, - "database/:database/_design/:ddoc/_view/:view": { + "database/:database/_design/:ddoc/_views/:view": { route: "viewFn", roles: ['_admin'] }, http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84440ec6/app/addons/documents/templates/design_doc_menu.html ---------------------------------------------------------------------- diff --git a/app/addons/documents/templates/design_doc_menu.html b/app/addons/documents/templates/design_doc_menu.html index 1227d33..8180f48 100644 --- a/app/addons/documents/templates/design_doc_menu.html +++ b/app/addons/documents/templates/design_doc_menu.html @@ -16,7 +16,7 @@ the License. <div class="js-collapse-toggle accordion-header" data-toggle="collapse" data-target="#<%- ddoc_clean %>" id="nav-header-<%- ddoc_clean %>" > <div class="accordion-list-item"> <div class="fonticon-play"></div> - <p><%- designDoc%></p> + <p>_design/<%- designDoc%></p> </div> <div class="new-button add-dropdown"></div> </div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84440ec6/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..434a02a 100644 --- a/app/addons/documents/templates/index_menu_item.html +++ b/app/addons/documents/templates/index_menu_item.html @@ -14,12 +14,12 @@ the License. <a class="js-toggle-<%-ddocType%> accordion-header js-collapse-toggle" data-toggle="collapse" data-target="#<%- removeSpecialCharacters(ddoc) + ddocType %>" id="nav-design-function-<%= removeSpecialCharacters(ddoc) + ddocType %>"> <div class="fonticon-play"></div> <span class="<%- icon %> fonticon"></span> - <%- ddocType %> + <%- name %> </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"> + <a data-ddoctype="<%- ddocType %>" id="<%- removeSpecialCharacters(ddoc) %>_<%- removeSpecialCharacters(index) %>" href="#/database/<%- safeURL(database) %>/_design/<%= safeURL(ddoc)%>/_<%-ddocType%>/<%= safeURL(index) %>" class="toggle-view"> <%- index %> </a> </li> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84440ec6/app/addons/documents/views-sidebar.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/views-sidebar.js b/app/addons/documents/views-sidebar.js index bfd921d..9f8c0ee 100644 --- a/app/addons/documents/views-sidebar.js +++ b/app/addons/documents/views-sidebar.js @@ -151,14 +151,14 @@ function(app, FauxtonAPI, Components, Documents, Databases) { toggleArrow: function(e){ this.$(e.currentTarget).toggleClass("down"); }, - buildIndexList: function(collection, selector, ddocType){ + buildIndexList: function(collection, info){ var design = this.model.id.replace(/^_design\//,""); this.insertView(".accordion-body", new Views.IndexItem({ - selector: selector, + selector: info.selector, ddoc: design, - collection: collection[selector], - ddocType: ddocType, + collection: collection[info.selector], + name: info.name, database: this.model.collection.database.id })); }, @@ -202,9 +202,13 @@ 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, { + selector: "views", + name: 'Views' + }); + + _.each(sidebarListTypes, function (info) { + this.buildIndexList(ddocDocs, info); },this); }, @@ -234,9 +238,9 @@ function(app, FauxtonAPI, Components, Documents, Databases) { this.database = options.database; this.selected = !! options.selected; this.selector = options.selector; - this.ddocType = options.ddocType || this.selector; + this.name = options.name; this.icons = { - "view": "fonticon-sidenav-map-reduce", + "Views": "fonticon-sidenav-map-reduce", "indexes": "fonticon-sidenav-search" }; @@ -245,7 +249,8 @@ function(app, FauxtonAPI, Components, Documents, Databases) { serialize: function() { return { icon: this.icons[this.ddocType], - ddocType: this.ddocType, + ddocType: this.selector, + name: this.name, index: this.index, ddoc: this.ddoc, database: this.database,
