From 09351a0535fe9bc3fa780763c095fd6dc56175de Mon Sep 17 00:00:00 2001
From: John Christopher Anderson <jchris@apache.org>
Date: Mon, 18 Jan 2010 03:45:54 +0000
Subject: normalize userCtx name and roles, also, no log in via a conflict doc

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@900275 13f79535-47bb-0310-9956-ffa450edef68
---
 share/www/dialog/_create_admin.html | 2 +-
 share/www/dialog/_login.html        | 4 ++--
 share/www/dialog/_signup.html       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'share/www/dialog')

diff --git a/share/www/dialog/_create_admin.html b/share/www/dialog/_create_admin.html
index e4141e1d..d4aec95a 100644
--- a/share/www/dialog/_create_admin.html
+++ b/share/www/dialog/_create_admin.html
@@ -27,7 +27,7 @@ specific language governing permissions and limitations under the License.
     </p>
     <table summary=""><tbody><tr>
       <th><label>Username:</label></th>
-      <td><input type="text" name="username" size="24"></td>
+      <td><input type="text" name="name" size="24"></td>
     </tr><tr>
       <th><label>Password:</label></th>
       <td><input type="password" name="password" size="24"></td>
diff --git a/share/www/dialog/_login.html b/share/www/dialog/_login.html
index 959f7233..f05a5fdc 100644
--- a/share/www/dialog/_login.html
+++ b/share/www/dialog/_login.html
@@ -16,11 +16,11 @@ specific language governing permissions and limitations under the License.
   <h2>Login</h2>
   <fieldset>
     <p class="help">
-      Login to CouchDB with your username and password.
+      Login to CouchDB with your name and password.
     </p>
     <table summary=""><tbody><tr>
       <th><label>Username:</label></th>
-      <td><input type="text" name="username" size="24"></td>
+      <td><input type="text" name="name" size="24"></td>
     </tr><tr>
       <th><label>Password:</label></th>
       <td><input type="password" name="password" size="24"></td>
diff --git a/share/www/dialog/_signup.html b/share/www/dialog/_signup.html
index 884b4be2..7ba3448a 100644
--- a/share/www/dialog/_signup.html
+++ b/share/www/dialog/_signup.html
@@ -21,7 +21,7 @@ specific language governing permissions and limitations under the License.
     </p>
     <table summary=""><tbody><tr>
       <th><label>Username:</label></th>
-      <td><input type="text" name="username" size="24"></td>
+      <td><input type="text" name="name" size="24"></td>
     </tr><tr>
       <th><label>Password:</label></th>
       <td><input type="password" name="password" size="24"></td>
-- 
cgit v1.2.3