HIPFORGE-286 Reset password: show timezones/captcha

- extend right class, add child nodes
bloomreach-forge · May 28, 2019 · 8f7924c · 8f7924c
1 parent 97e4015
commit 8f7924c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/cms/src/main/java/org/onehippo/forge/resetpassword/login/CustomLoginPlugin.java b/cms/src/main/java/org/onehippo/forge/resetpassword/login/CustomLoginPlugin.java
@@ -50,7 +50,7 @@ public void renderHead(final IHeaderResponse response) {
         response.render(CssHeaderItem.forReference(loginCss));
     }
 
-    class CustomLoginForm extends LoginPanel {
+    class CustomLoginForm extends LoginForm {
 
         public CustomLoginForm(final String id, final boolean autoComplete, final List<String> locales, final LoginHandler handler) {
             super(id, autoComplete, locales, handler);

diff --git a/...n/resources/org/onehippo/forge/resetpassword/login/CustomLoginPlugin$CustomLoginForm.html b/...n/resources/org/onehippo/forge/resetpassword/login/CustomLoginPlugin$CustomLoginForm.html
@@ -1,22 +1,23 @@
 <!--
-    * Copyright 2007-2019 BloomReach Inc. (https://www.bloomreach.com)
-    *
-    * 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.
--->
+  Copyright 2019 Hippo B.V. (http://www.onehippo.com)
+
+  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.
+  -->
 <html xmlns:wicket="http://wicket.apache.org/">
 <body>
 <wicket:panel>
     <wicket:extend>
+        <wicket:child/>
         <div class="hippo-login-form-label">
             <a href="./resetpassword" class="pn-link resetpassword-link">
                 <label wicket:id="forgot-password-label"></label>