#fixes #156

some small usability improvements to login: - autofocus username field - submit on enter key
eXist-db · Jun 20, 2021 · 0da69dc · 0da69dc
1 parent 3360020
commit 0da69dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/bower_components/existdb-launcher/existdb-login.html b/bower_components/existdb-launcher/existdb-login.html
@@ -56,8 +56,8 @@
             <h2>Login</h2>
             <paper-dialog-scrollable>
                 <form action="login">
-                    <paper-input name="user" label="User" value="{{user}}"></paper-input>
-                    <paper-input name="password" label="Password" type="password" value="{{password}}"></paper-input>
+                    <paper-input name="user" label="User" value="{{user}}" on-keyup="_submitDialog" autofocus></paper-input>
+                    <paper-input name="password" label="Password" type="password" value="{{password}}" on-keyup="_submitDialog"></paper-input>
                     <input id="logout" type="hidden" name="logout"></input>
                 </form>
                 <template is="dom-if" if="[[_invalid]]">
@@ -222,7 +222,7 @@ <h2>Login</h2>
                     this.user = resp.user;
                     this.groups = resp.groups;
                     this._invalid = false;
-                    if (!wasLoggedIn && this.$.loginDialog.opened && this.loginUrl) {
+                    if (!wasLoggedIn && this.loginUrl) {
                         window.location = this.loginUrl;
                     }
                     this.$.loginDialog.close();
@@ -247,6 +247,12 @@ <h2>Login</h2>
                 return true;
             }
 
+            _submitDialog(ev){
+                if(ev.keyCode === 13){
+                    this._confirmLogin();
+                }
+            }
+
             /**
              * Fired on successful login.
              *

diff --git a/controller.xql b/controller.xql
@@ -85,20 +85,7 @@ else if ($exist:path = "/admin") then (
                 <set-header name="Cache-Control" value="no-cache"/>
             </forward>
         </dispatch>
-    )
-    else(
-(:
-        let $log := util:log("info", "user is not logged in")
-        return
-:)
-        <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-            (:<forward url="{$exist:controller}/index.html"></forward>:)
-            <redirect url="login.html">
-                <cache-control cache="no"/>
-                <set-header name="Cache-Control" value="no-cache"/>
-            </redirect>
-        </dispatch>
-        )
+    ) else ()
 )
 else
     <dispatch xmlns="http://exist.sourceforge.net/NS/exist">

diff --git a/expath-pkg.xml b/expath-pkg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://expath.org/ns/pkg" name="http://exist-db.org/apps/dashboard" abbrev="dashboard" version="2.0.7" spec="1.0">
+<package xmlns="http://expath.org/ns/pkg" name="http://exist-db.org/apps/dashboard" abbrev="dashboard" version="2.0.8" spec="1.0">
     <title>Dashboard</title>
     <dependency processor="http://exist-db.org" semver-min="5.0.0"/>
     <dependency package="http://www.functx.com" semver-min="1.0"/>