summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuelockwood <deathbear@apache.org>2014-02-27 15:33:48 -0500
committersuelockwood <deathbear@apache.org>2014-02-27 15:33:48 -0500
commit48f586f850a4cc92e938d84bfc98ba33f125861e (patch)
tree7dcd09d8adcf2d0bfc99ee5e15c24174395dc4a2
parent055219f106b271dc17f0e469fb967489f4ef962e (diff)
downloadcouchdb-48f586f850a4cc92e938d84bfc98ba33f125861e.tar.gz
Added the "everyone is an admin" & "fix this" note and move the text around on the page.
Got rid of the extra header
-rw-r--r--src/fauxton/app/addons/auth/templates/create_admin.html21
-rw-r--r--src/fauxton/app/addons/auth/templates/nav_link_title.html3
-rw-r--r--src/fauxton/assets/less/fauxton.less4
3 files changed, 15 insertions, 13 deletions
diff --git a/src/fauxton/app/addons/auth/templates/create_admin.html b/src/fauxton/app/addons/auth/templates/create_admin.html
index 4715be55c..8f4ed2ca5 100644
--- a/src/fauxton/app/addons/auth/templates/create_admin.html
+++ b/src/fauxton/app/addons/auth/templates/create_admin.html
@@ -13,21 +13,20 @@ the License.
-->
<div class="span12">
- <h2> Add Admin </h2>
+ <p class="help-block">
+ Before a server admin is configured, all clients have admin privileges.
+ This is fine when HTTP access is restricted
+ to trusted users. <strong>If end-users will be accessing this CouchDB, you must
+ create an admin account to prevent accidental (or malicious) data loss.</strong>
+ </p>
+ <p class="help-block">Server admins can create and destroy databases, install
+ and update _design documents, run the test suite, and edit all aspects of CouchDB
+ configuration.
+ </p>
<form id="create-admin-form">
<input id="username" type="text" name="name" placeholder= "Username:" size="24">
<br/>
<input id="password" type="password" name="password" placeholder= "Password" size="24">
- <p class="help-block">
- Before a server admin is configured, all clients have admin privileges.
- This is fine when HTTP access is restricted
- to trusted users. <strong>If end-users will be accessing this CouchDB, you must
- create an admin account to prevent accidental (or malicious) data loss.</strong>
- </p>
- <p class="help-block">Server admins can create and destroy databases, install
- and update _design documents, run the test suite, and edit all aspects of CouchDB
- configuration.
- </p>
<p class="help-block">Non-admin users have read and write access to all databases, which
are controlled by validation functions. CouchDB can be configured to block all
access to anonymous users.
diff --git a/src/fauxton/app/addons/auth/templates/nav_link_title.html b/src/fauxton/app/addons/auth/templates/nav_link_title.html
index b23157e8c..699ea80cd 100644
--- a/src/fauxton/app/addons/auth/templates/nav_link_title.html
+++ b/src/fauxton/app/addons/auth/templates/nav_link_title.html
@@ -14,7 +14,8 @@ the License.
<% if (admin_party) { %>
<a id="user-create-admin" href="#createAdmin">
<span class="fonticon-user fonticon"></span>
- Admin Party!
+ Admin Party! [FIX THIS]
+ <small>Everyone is an admin.</small>
</a>
<% } else if (user) { %>
<a href="#changePassword" >
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index 82c65bdc5..229075b9c 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -340,7 +340,9 @@ table.databases {
bottom: 0;
width: 100%;
}
-
+ #user-create-admin{
+ font-size: 12px
+ }
.navbar {
.brand {
.box-sizing(content-box);