From 48f586f850a4cc92e938d84bfc98ba33f125861e Mon Sep 17 00:00:00 2001 From: suelockwood Date: Thu, 27 Feb 2014 15:33:48 -0500 Subject: [PATCH 1/2] Added the "everyone is an admin" & "fix this" note and move the text around on the page. Got rid of the extra header --- .../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(-) diff --git a/src/fauxton/app/addons/auth/templates/create_admin.html b/src/fauxton/app/addons/auth/templates/create_admin.html index 4715be55c99..8f4ed2ca51a 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 @@ -->
-

Add Admin

+

+ Before a server admin is configured, all clients have admin privileges. + This is fine when HTTP access is restricted + to trusted users. If end-users will be accessing this CouchDB, you must + create an admin account to prevent accidental (or malicious) data loss. +

+

Server admins can create and destroy databases, install + and update _design documents, run the test suite, and edit all aspects of CouchDB + configuration. +


-

- Before a server admin is configured, all clients have admin privileges. - This is fine when HTTP access is restricted - to trusted users. If end-users will be accessing this CouchDB, you must - create an admin account to prevent accidental (or malicious) data loss. -

-

Server admins can create and destroy databases, install - and update _design documents, run the test suite, and edit all aspects of CouchDB - configuration. -

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 b23157e8cba..699ea80cdfe 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 @@ <% if (admin_party) { %> - Admin Party! + Admin Party! [FIX THIS] + Everyone is an admin. <% } else if (user) { %> diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index 82c65bdc587..229075b9ce5 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); From 0df722e66b66bbad172a237b6fd1521b4a346676 Mon Sep 17 00:00:00 2001 From: suelockwood Date: Fri, 28 Feb 2014 09:55:05 -0500 Subject: [PATCH 2/2] Added Highlight to the admin party to make it stand out more. --- src/Makefile.am | 1 + src/fauxton/app/addons/auth/assets/less/auth.less | 15 +++++++++++++++ .../app/addons/auth/templates/nav_link_title.html | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/fauxton/app/addons/auth/assets/less/auth.less diff --git a/src/Makefile.am b/src/Makefile.am index 32a1a6a7b4a..59aa6bfb920 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,7 @@ FAUXTON_FILES = \ fauxton/app/addons/auth/base.js \ fauxton/app/addons/auth/resources.js \ fauxton/app/addons/auth/routes.js \ + fauxton/app/addons/auth/assets/less/auth.less \ fauxton/app/addons/auth/templates/change_password.html \ fauxton/app/addons/auth/templates/create_admin.html \ fauxton/app/addons/auth/templates/login.html \ diff --git a/src/fauxton/app/addons/auth/assets/less/auth.less b/src/fauxton/app/addons/auth/assets/less/auth.less new file mode 100644 index 00000000000..8a718177ad8 --- /dev/null +++ b/src/fauxton/app/addons/auth/assets/less/auth.less @@ -0,0 +1,15 @@ +/* Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +#primary-navbar .navbar nav .nav li a#user-create-admin{ + background-color: #af2d24; +} 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 699ea80cdfe..863955cb34a 100644 --- a/src/fauxton/app/addons/auth/templates/nav_link_title.html +++ b/src/fauxton/app/addons/auth/templates/nav_link_title.html @@ -12,7 +12,7 @@ the License. --> <% if (admin_party) { %> - + Admin Party! [FIX THIS] Everyone is an admin.