This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 10f0f7e [OPENMEETINGS-2165] auto-focus is added
10f0f7e is described below
commit 10f0f7ebd3253f5bed3743ec530d48a341d107a9
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Mar 24 12:09:32 2020 +0700
[OPENMEETINGS-2165] auto-focus is added
---
.../web/pages/auth/ForgetPasswordDialog.html | 2 +-
.../web/pages/auth/RegisterDialog.html | 26 +++++++++++++++++-----
.../openmeetings/web/pages/auth/SignInDialog.html | 2 +-
.../openmeetings/web/pages/auth/SignInPage.html | 6 ++---
.../openmeetings/web/pages/auth/SignInPage.java | 12 ++++++++++
5 files changed, 37 insertions(+), 11 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
index 6ea923c..d483efd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
@@ -41,7 +41,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i
wicket:id="label" class="fa fa-lock"></i></span>
</div>
- <input wicket:id="name" class="form-control"
type="text" value=""/>
+ <input wicket:id="name" class="form-control
auto-focus" type="text" value=""/>
</div>
</div>
<div class="row form-group no-gutters">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
index ffd3435..d6242e2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
@@ -23,8 +23,22 @@
<wicket:extend>
<form wicket:id="form">
<div class="row form-group no-gutters">
- <div class="col-6"><input wicket:id="firstName"
type="text" wicket:message="placeholder:117" value=""/></div>
- <div class="col-6"><input wicket:id="lastName"
type="text" wicket:message="placeholder:136" value=""/></div>
+ <div class="col-6">
+ <div class="input-group">
+ <div class="input-group-prepend">
+ <span
class="input-group-text"><i class="fa fa-user"></i></span>
+ </div>
+ <input wicket:id="firstName"
class="form-control auto-focus" type="text" wicket:message="placeholder:117"
value=""/>
+ </div>
+ </div>
+ <div class="col-6">
+ <div class="input-group">
+ <div class="input-group-prepend">
+ <span
class="input-group-text"><i class="fa fa-user"></i></span>
+ </div>
+ <input wicket:id="lastName"
class="form-control" type="text" wicket:message="placeholder:136" value=""/>
+ </div>
+ </div>
</div>
<div class="row form-group no-gutters">
<div class="col-6">
@@ -32,7 +46,7 @@
<div class="input-group-prepend">
<span
class="input-group-text"><i class="fa fa-user"></i></span>
</div>
- <input wicket:id="login" type="text"
wicket:message="placeholder:114" value=""/>
+ <input wicket:id="login"
class="form-control" type="text" wicket:message="placeholder:114" value=""/>
</div>
</div>
<div class="col-6">
@@ -40,7 +54,7 @@
<div class="input-group-prepend">
<span
class="input-group-text"><i class="fa fa-at"></i></span>
</div>
- <input wicket:id="email" type="email"
wicket:message="placeholder:119" value=""/>
+ <input wicket:id="email"
class="form-control" type="email" wicket:message="placeholder:119" value=""/>
</div>
</div>
</div>
@@ -50,7 +64,7 @@
<div class="input-group-prepend">
<span
class="input-group-text"><i class="fa fa-lock"></i></span>
</div>
- <input wicket:id="password"
type="password" wicket:message="placeholder:110" value=""/>
+ <input wicket:id="password"
class="form-control" type="password" wicket:message="placeholder:110" value=""/>
</div>
</div>
<div class="col-6">
@@ -58,7 +72,7 @@
<div class="input-group-prepend">
<span
class="input-group-text"><i class="fa fa-lock"></i></span>
</div>
- <input wicket:id="confirmPassword"
type="password" wicket:message="placeholder:116" value=""/>
+ <input wicket:id="confirmPassword"
class="form-control" type="password" wicket:message="placeholder:116" value=""/>
</div>
</div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
index 419e744..68f6dc1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
@@ -28,7 +28,7 @@
<div class="input-group-prepend">
<span
class="input-group-text"><i class="fa fa-user"></i></span>
</div>
- <input wicket:id="login"
class="form-control" type="text" value=""
wicket:message="placeholder:109,title:109"/>
+ <input wicket:id="login"
class="form-control auto-focus" type="text" value=""
wicket:message="placeholder:109,title:109"/>
</div>
</div>
<div class="form-group no-gutters">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
index 7e11518..9d02571 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
@@ -21,10 +21,10 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:extend>
- <div wicket:id="signin"></div>
- <div wicket:id="register"></div>
+ <div wicket:id="signin" id="signin-dialog"></div>
+ <div wicket:id="register" id="register-dialog"></div>
<div wicket:id="registerInfo"></div>
- <div wicket:id="forget"></div>
+ <div wicket:id="forget" id="forget-dialog"></div>
<div wicket:id="forgetInfo"></div>
<div wicket:id="kick"></div>
</wicket:extend>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index 84792e1..b31bdff 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -61,6 +61,8 @@ import org.apache.openmeetings.web.pages.BaseInitedPage;
import org.apache.openmeetings.web.room.IconTextModal;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.IRequestParameters;
@@ -211,6 +213,16 @@ public class SignInPage extends BaseInitedPage {
);
}
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnDomReadyHeaderItem.forScript(""
+ + "$('#signin-dialog, #register-dialog,
#forget-dialog').on('shown.bs.modal', function () {\n"
+ + "
$(this).find('.auto-focus').trigger('focus');\n"
+ + "})"
+ ));
+ }
+
boolean allowRegister() {
return isAllowRegisterFrontend();
}
