Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 75900 invoked from network); 22 Feb 2010 16:58:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Feb 2010 16:58:26 -0000 Received: (qmail 42458 invoked by uid 500); 22 Feb 2010 16:58:26 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 42384 invoked by uid 500); 22 Feb 2010 16:58:26 -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 42375 invoked by uid 99); 22 Feb 2010 16:58:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Feb 2010 16:58:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Feb 2010 16:58:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 740B82388993; Mon, 22 Feb 2010 16:58:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r912653 - in /couchdb/branches/0.11.x: ./ etc/default/couchdb share/Makefile.am share/www/image/key.png share/www/style/layout.css Date: Mon, 22 Feb 2010 16:58:05 -0000 To: commits@couchdb.apache.org From: cmlenz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100222165805.740B82388993@eris.apache.org> Author: cmlenz Date: Mon Feb 22 16:58:04 2010 New Revision: 912653 URL: http://svn.apache.org/viewvc?rev=912653&view=rev Log: Backport r912608 (Add a proper icon for the security button.) Added: couchdb/branches/0.11.x/share/www/image/key.png - copied unchanged from r912608, couchdb/trunk/share/www/image/key.png Modified: couchdb/branches/0.11.x/ (props changed) couchdb/branches/0.11.x/etc/default/couchdb (props changed) couchdb/branches/0.11.x/share/Makefile.am couchdb/branches/0.11.x/share/www/style/layout.css Propchange: couchdb/branches/0.11.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Feb 22 16:58:04 2010 @@ -6,4 +6,4 @@ /couchdb/branches/list-iterator:782292-784593 /couchdb/branches/tail_header:775760-778477 /couchdb/tags/0.10.0:825400 -/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912636 +/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912636 Propchange: couchdb/branches/0.11.x/etc/default/couchdb ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Feb 22 16:58:04 2010 @@ -6,5 +6,5 @@ /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477 /couchdb/tags/0.10.0/etc/default/couchdb:825400 -/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912636 +/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912636 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440 Modified: couchdb/branches/0.11.x/share/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/Makefile.am?rev=912653&r1=912652&r2=912653&view=diff ============================================================================== --- couchdb/branches/0.11.x/share/Makefile.am (original) +++ couchdb/branches/0.11.x/share/Makefile.am Mon Feb 22 16:58:04 2010 @@ -64,6 +64,7 @@ www/image/delete.png \ www/image/grippie.gif \ www/image/hgrad.gif \ + www/image/key.png \ www/image/load.png \ www/image/logo.png \ www/image/order-asc.gif \ Modified: couchdb/branches/0.11.x/share/www/style/layout.css URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/style/layout.css?rev=912653&r1=912652&r2=912653&view=diff ============================================================================== --- couchdb/branches/0.11.x/share/www/style/layout.css (original) +++ couchdb/branches/0.11.x/share/www/style/layout.css Mon Feb 22 16:58:04 2010 @@ -236,7 +236,7 @@ #toolbar button:hover { background-position: 2px -30px; color: #000; } #toolbar button:active { background-position: 2px -62px; color: #000; } #toolbar button.add { background-image: url(../image/add.png); } -#toolbar button.security { background-image: url(../image/compact.png); } +#toolbar button.security { background-image: url(../image/key.png); } #toolbar button.compact { background-image: url(../image/compact.png); } #toolbar button.delete { background-image: url(../image/delete.png); } #toolbar button.load { background-image: url(../image/load.png); }