You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by cm...@apache.org on 2010/02/25 11:47:56 UTC
svn commit: r916239 - in /couchdb/branches/0.11.x: ./ etc/default/couchdb
share/www/dialog/_database_security.html share/www/style/layout.css
Author: cmlenz
Date: Thu Feb 25 10:47:55 2010
New Revision: 916239
URL: http://svn.apache.org/viewvc?rev=916239&view=rev
Log:
Backport r915526 (Futon: Make the DB security dialog more compact.)
Modified:
couchdb/branches/0.11.x/ (props changed)
couchdb/branches/0.11.x/etc/default/couchdb (props changed)
couchdb/branches/0.11.x/share/www/dialog/_database_security.html
couchdb/branches/0.11.x/share/www/style/layout.css
Propchange: couchdb/branches/0.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 10:47:55 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,912608,912615,912636,915529,915827,916076,916153
+/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529,915827,916076,916153
Propchange: couchdb/branches/0.11.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 25 10:47:55 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,912608,912615,912636,915529,915827,916076,916153
+/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529,915827,916076,916153
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/0.11.x/share/www/dialog/_database_security.html
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/dialog/_database_security.html?rev=916239&r1=916238&r2=916239&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/dialog/_database_security.html (original)
+++ couchdb/branches/0.11.x/share/www/dialog/_database_security.html Thu Feb 25 10:47:55 2010
@@ -13,12 +13,13 @@
-->
<form action="" method="post">
- <h2>Admins and Readers</h2>
- <p class="help">
- Each database contains lists of admins and readers.
- Admins and readers are each defined by <tt>names</tt> and <tt>roles</tt>, which are lists of strings. For example, if the readers is defined by <tt>names ["jane", "mike"]</tt> and roles <tt>["bbq"]</tt> then anyone with a <tt>"bbq"</tt> role can read the database. Yummy!
- </p>
+ <h2>Security</h2>
<fieldset>
+ <p class="help">
+ Each database contains lists of admins and readers.
+ Admins and readers are each defined by <tt>names</tt> and <tt>roles</tt>, which are lists of strings.
+ </p>
+
<h3>Admins</h3>
<p class="help">Database admins can update design documents and edit the readers list.</p>
<table summary=""><tbody><tr>
@@ -29,10 +30,9 @@
<td><input type="text" name="admin_roles" size="40"></td>
</tr>
</tbody></table>
- </fieldset>
- <fieldset>
+
<h3>Readers</h3>
- <p class="help">Database readers can access the database. If no readers are defined, the database is public. When readers are defined, only they may read or write to the database.</p>
+ <p class="help">Database readers can access the database. If no readers are defined, the database is public.</p>
<table summary=""><tbody><tr>
<th><label>Names:</label></th>
<td><input type="text" name="reader_names" size="40"></td>
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=916239&r1=916238&r2=916239&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/style/layout.css (original)
+++ couchdb/branches/0.11.x/share/www/style/layout.css Thu Feb 25 10:47:55 2010
@@ -268,9 +268,8 @@
body.loading #dialog h2 {
background-image: url(../image/spinner.gif);
}
-#dialog h3 {
- color: #ccc; font-size: 110%; font-weight: bold; margin: 0 -2em;
- padding: .35em 2em;
+#dialog h3 { color: #ccc; font-size: 100%; font-weight: bold; margin: 0 -2em;
+ padding: .35em 2em 0;
}
#dialog fieldset { background: #222; border-top: 1px solid #111;
margin: 0 0 1em; padding: .5em 1em 1em;