Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 80D8311714 for ; Thu, 19 Jun 2014 06:02:21 +0000 (UTC) Received: (qmail 87673 invoked by uid 500); 19 Jun 2014 06:02:20 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 87581 invoked by uid 500); 19 Jun 2014 06:02:20 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 85872 invoked by uid 99); 19 Jun 2014 06:02:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 06:02:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 41715983815; Thu, 19 Jun 2014 06:02:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garren@apache.org To: commits@couchdb.apache.org Date: Thu, 19 Jun 2014 06:02:55 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [38/50] [abbrv] couchdb commit: updated refs/heads/Update-Sidebar-Ui to d34dfae Correct icons Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bf1b1c25 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bf1b1c25 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bf1b1c25 Branch: refs/heads/Update-Sidebar-Ui Commit: bf1b1c25c63191630ab47b86328b8554d4cbe69a Parents: 2c9c823 Author: Garren Smith Authored: Wed Jun 11 14:30:03 2014 +0200 Committer: Garren Smith Committed: Wed Jun 18 16:56:46 2014 +0200 ---------------------------------------------------------------------- src/fauxton/app/addons/documents/sidebarviews.js | 7 ++++++- .../app/addons/documents/templates/design_doc_menu.html | 2 +- .../app/addons/documents/templates/index_menu_item.html | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/bf1b1c25/src/fauxton/app/addons/documents/sidebarviews.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/sidebarviews.js b/src/fauxton/app/addons/documents/sidebarviews.js index d800154..bf07d28 100644 --- a/src/fauxton/app/addons/documents/sidebarviews.js +++ b/src/fauxton/app/addons/documents/sidebarviews.js @@ -217,11 +217,16 @@ 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" + }; + }, serialize: function() { return { - icon: this.ddocType, + icon: this.icons[this.ddocType], ddocType: this.ddocType, index: this.index, ddoc: this.ddoc, http://git-wip-us.apache.org/repos/asf/couchdb/blob/bf1b1c25/src/fauxton/app/addons/documents/templates/design_doc_menu.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/design_doc_menu.html b/src/fauxton/app/addons/documents/templates/design_doc_menu.html index e471103..e49ec21 100644 --- a/src/fauxton/app/addons/documents/templates/design_doc_menu.html +++ b/src/fauxton/app/addons/documents/templates/design_doc_menu.html @@ -23,7 +23,7 @@ the License.
  • - + Design Doc Metadata
  • http://git-wip-us.apache.org/repos/asf/couchdb/blob/bf1b1c25/src/fauxton/app/addons/documents/templates/index_menu_item.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/index_menu_item.html b/src/fauxton/app/addons/documents/templates/index_menu_item.html index 42dc2db..ad5979b 100644 --- a/src/fauxton/app/addons/documents/templates/index_menu_item.html +++ b/src/fauxton/app/addons/documents/templates/index_menu_item.html @@ -13,7 +13,7 @@ the License. -->
    - + <%- ddocType %>