Added the "everyone is an admin" & "fix this" note and move the text around on the page. Got rid of the extra header
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/48f586f8 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/48f586f8 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/48f586f8 Branch: refs/heads/2041-update-ibrowse Commit: 48f586f850a4cc92e938d84bfc98ba33f125861e Parents: 055219f Author: suelockwood <[email protected]> Authored: Thu Feb 27 15:33:48 2014 -0500 Committer: suelockwood <[email protected]> Committed: Thu Feb 27 15:33:48 2014 -0500 ---------------------------------------------------------------------- .../app/addons/auth/templates/create_admin.html | 21 ++++++++++---------- .../addons/auth/templates/nav_link_title.html | 3 ++- src/fauxton/assets/less/fauxton.less | 4 +++- 3 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/48f586f8/src/fauxton/app/addons/auth/templates/create_admin.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/auth/templates/create_admin.html b/src/fauxton/app/addons/auth/templates/create_admin.html index 4715be5..8f4ed2c 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. http://git-wip-us.apache.org/repos/asf/couchdb/blob/48f586f8/src/fauxton/app/addons/auth/templates/nav_link_title.html ---------------------------------------------------------------------- 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 b23157e..699ea80 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" > http://git-wip-us.apache.org/repos/asf/couchdb/blob/48f586f8/src/fauxton/assets/less/fauxton.less ---------------------------------------------------------------------- diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index 82c65bd..229075b 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);
