couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject fauxton commit: updated refs/heads/master to 67ad38f
Date Wed, 05 Nov 2014 10:57:38 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 536b5b19b -> 67ad38f84


Account page style and usability fixes

This ticket is a general style clean-up of the Accounts page. Namely:

- general CSS style fixes
- sidebar styles now consistent with other pages in app
- focus is placed on first text box on page when page load (N.B.
autofocus wouldn’t work consistently, hence the JS)
- "Databases" left nav item no longer selected

*** Please note: the Create Admins page is still having it's text cut
off. This will be fixed once PR #123 has been merged. ***

Closes COUCHDB-2417


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/67ad38f8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/67ad38f8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/67ad38f8

Branch: refs/heads/master
Commit: 67ad38f84e485b8fadec6d59b70519b420aab5a1
Parents: 536b5b1
Author: Benjamin Keen <ben.keen@gmail.com>
Authored: Sun Nov 2 08:35:04 2014 -0800
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Wed Nov 5 11:57:12 2014 +0100

----------------------------------------------------------------------
 app/addons/auth/assets/less/auth.less          | 18 +++++++-
 app/addons/auth/resources.js                   | 10 +++++
 app/addons/auth/routes.js                      |  3 +-
 app/addons/auth/templates/change_password.html | 27 ++++++------
 app/addons/auth/templates/create_admin.html    | 47 +++++++++++----------
 app/addons/auth/templates/nav_dropdown.html    | 12 +++---
 app/addons/auth/templates/noAccess.html        |  5 +--
 7 files changed, 75 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/67ad38f8/app/addons/auth/assets/less/auth.less
----------------------------------------------------------------------
diff --git a/app/addons/auth/assets/less/auth.less b/app/addons/auth/assets/less/auth.less
index 0210094..146727e 100644
--- a/app/addons/auth/assets/less/auth.less
+++ b/app/addons/auth/assets/less/auth.less
@@ -13,6 +13,22 @@
 
 @import "../../../../../assets/less/variables.less";
 
-#primary-navbar .navbar nav .nav li a#user-create-admin{
+/*#primary-navbar .navbar nav .nav li a#user-create-admin{
   background-color: @navBG;
+}*/
+
+.sidenav header {
+  padding-left: 24px;
+
+  h3 {
+    margin: 8px 0px 4px;
+  }
+}
+
+.auth-page {
+  padding: 20px;
+
+  h3 {
+    margin-top: 0px;
+  }
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/67ad38f8/app/addons/auth/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/auth/resources.js b/app/addons/auth/resources.js
index 0327a3a..26609a9 100644
--- a/app/addons/auth/resources.js
+++ b/app/addons/auth/resources.js
@@ -216,6 +216,7 @@ function (app, FauxtonAPI, CouchdbSession) {
 
   Auth.CreateAdminView = FauxtonAPI.View.extend({
     template: 'addons/auth/templates/create_admin',
+    className: "auth-page",
 
     initialize: function (options) {
       options = options || {};
@@ -256,6 +257,10 @@ function (app, FauxtonAPI, CouchdbSession) {
         msg = FauxtonAPI.session.messages.adminCreationFailedPrefix + ' ' + msg;
         errorHandler(msg);
       });
+    },
+
+    afterRender: function() {
+      $("#username").focus();
     }
   });
 
@@ -298,6 +303,7 @@ function (app, FauxtonAPI, CouchdbSession) {
 
   Auth.ChangePassword = FauxtonAPI.View.extend({
     template: 'addons/auth/templates/change_password',
+    className: "auth-page",
 
     events: {
       "submit #change-password": "changePassword"
@@ -319,6 +325,10 @@ function (app, FauxtonAPI, CouchdbSession) {
       });
 
       promise.fail(errorHandler);
+    },
+
+    afterRender: function () {
+      $("#password").focus();
     }
   });
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/67ad38f8/app/addons/auth/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/auth/routes.js b/app/addons/auth/routes.js
index 98e7393..1e0a9b9 100644
--- a/app/addons/auth/routes.js
+++ b/app/addons/auth/routes.js
@@ -78,7 +78,8 @@ function(app, FauxtonAPI, Auth) {
         route: 'addAdmin'
       }
     },
-    
+    selectedHeader: "", // TODO prevents "Databases" being selected at least
+
     initialize: function () {
       this.navDrop = this.setView('#sidebar-content', new Auth.NavDropDown({model: FauxtonAPI.session}));
     },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/67ad38f8/app/addons/auth/templates/change_password.html
----------------------------------------------------------------------
diff --git a/app/addons/auth/templates/change_password.html b/app/addons/auth/templates/change_password.html
index 64b7d1f..8879866 100644
--- a/app/addons/auth/templates/change_password.html
+++ b/app/addons/auth/templates/change_password.html
@@ -1,4 +1,4 @@
-<!--
+<%/*
 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
@@ -10,17 +10,20 @@ 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.
--->
+*/%>
 
-<div class="span12">
-  <h2> Change Password </h2>
-  <form id="change-password">
-    <p class="help-block">
+<h3>Change Password</h3>
+
+<form id="change-password">
+  <p>
     Enter your new password.
-    </p>
-    <input id="password" type="password" name="password" placeholder= "New Password:"
size="24">
-    <br/>
-    <input id="password-confirm" type="password" name="password_confirm" placeholder=
"Verify New Password" size="24">
+  </p>
+  <input id="password" type="password" name="password" placeholder="Password" size="24">
+  <br/>
+  <input id="password-confirm" type="password" name="password_confirm" placeholder= "Verify
Password" size="24">
+  <br/>
+
+  <p>
     <button type="submit" class="btn btn-primary">Change</button>
-  </form>
-</div>
+  </p>
+</form>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/67ad38f8/app/addons/auth/templates/create_admin.html
----------------------------------------------------------------------
diff --git a/app/addons/auth/templates/create_admin.html b/app/addons/auth/templates/create_admin.html
index 48333df..9da8fa9 100644
--- a/app/addons/auth/templates/create_admin.html
+++ b/app/addons/auth/templates/create_admin.html
@@ -1,4 +1,4 @@
-<!--
+<%/*
 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
@@ -10,27 +10,28 @@ 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.
--->
+*/%>
 
-<div class="span12">
-  <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.
+<h3>Create Admins</h3>
+
+<p>
+  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>
+  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>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.
   </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">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.
-    </p>
-    <button type="submit" href="#" id="create-admin" class="btn btn-primary">Create
Admin</button>
-  </form>
-</div>
+  <button type="submit" href="#" id="create-admin" class="btn btn-primary">Create Admin</button>
+</form>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/67ad38f8/app/addons/auth/templates/nav_dropdown.html
----------------------------------------------------------------------
diff --git a/app/addons/auth/templates/nav_dropdown.html b/app/addons/auth/templates/nav_dropdown.html
index 983b5f7..44acf10 100644
--- a/app/addons/auth/templates/nav_dropdown.html
+++ b/app/addons/auth/templates/nav_dropdown.html
@@ -1,4 +1,4 @@
-<!--
+<%/*
 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
@@ -10,17 +10,15 @@ 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.
--->
+*/%>
 
-<div id="sidenav">
+<div class="sidenav">
 <header class="row-fluid">
-  <h3> <%- user.name %> </h3>
+  <h3><%- user.name %></h3>
 </header>
-<nav>
+
 <ul class="nav nav-list">
   <li class="active" ><a data-select="change-password" id="user-change-password"
href="#changePassword"> Change Password </a></li>
   <li ><a data-select="add-admin" href="#addAdmin"> Create Admins </a></li>
 </ul>
-</nav>
 </div>
-

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/67ad38f8/app/addons/auth/templates/noAccess.html
----------------------------------------------------------------------
diff --git a/app/addons/auth/templates/noAccess.html b/app/addons/auth/templates/noAccess.html
index 612d687..999624c 100644
--- a/app/addons/auth/templates/noAccess.html
+++ b/app/addons/auth/templates/noAccess.html
@@ -1,4 +1,4 @@
-<!--
+<%/*
 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
@@ -10,7 +10,7 @@ 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.
--->
+*/%>
 
 <div class="span12">
   <h2>Access Denied</h2>
@@ -20,7 +20,6 @@ the License.
       Please request authorization from the server administrators.
     <% } else { %>
       You might need to <a href="#login<% if (urlBack){ %>?urlback=<%-urlBack%>
 <% } %> ">login</a>.
-      </a>
     <% } %>
   </p>
 </div>


Mime
View raw message