resret password implementation.

Evolveum · Nov 11, 2016 · 7e1d652 · 7e1d652
1 parent ca1b179
commit 7e1d652
Show file tree

Hide file tree

Showing 22 changed files with 1,753 additions and 790 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -648,13 +648,18 @@ public void hideMainPopup(AjaxRequestTarget target) {
 
     private VisibleEnableBehaviour createUserStatusBehaviour(final boolean visibleIfLoggedIn) {
 		return new VisibleEnableBehaviour() {
+			private static final long serialVersionUID = 1L;
 
 			@Override
 			public boolean isVisible() {
-				return SecurityUtils.getPrincipalUser() != null ? visibleIfLoggedIn : !visibleIfLoggedIn;
+				return isSideMenuVisible(visibleIfLoggedIn);
 			}
 		};
 	}
+
+    protected boolean isSideMenuVisible(boolean visibleIfLoggedIn) {
+    	return SecurityUtils.getPrincipalUser() != null ? visibleIfLoggedIn : !visibleIfLoggedIn;
+    }
 
 	private void initDebugBarLayout() {
 		DebugBar debugPanel = new DebugBar(ID_DEBUG_PANEL);

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
diff --git a/...ge/forgetpassword/PageForgetPassword.html → ...ge/forgetpassword/PageForgotPassword.html b/...ge/forgetpassword/PageForgetPassword.html → ...ge/forgetpassword/PageForgotPassword.html
@@ -22,11 +22,13 @@
 <wicket:extend>
 
     <div class="row">
+
         <div class="col-md-offset-2 col-md-8 col-lg-offset-4 col-lg-4">
             <div class="panel panel-default" style="margin-top: 120px;">
                 <div class="panel-body">
                     <form wicket:id="pwdresetform" class="form-horizontal">
                         <div class="form-group">
+                        <div wicket:id="usernameContainer">
                             <label class="col-md-4 col-lg-4 control-label">
                                 <wicket:message key="PageForgetPassword.username"/>
                             </label>
@@ -35,8 +37,10 @@
                                 <input wicket:id="username" type="text" class="form-control input-sm focus-username"
                                        wicket:message="placeholder:PageForgetPassword.username">
                             </div>
+                            </div>
                         </div>
                         <div class="form-group">
+                        <div wicket:id="emailContainer">
                             <label class="col-md-4 col-lg-4 control-label">
                                 <wicket:message key="PageForgetPassword.email"/>
                             </label>
@@ -46,14 +50,34 @@
                                        wicket:message="placeholder:PageForgetPassword.email">
                             </div>
 
-
+                          </div>
                         </div>
 
-                        <input type="submit" class="btn btn-primary pull-right" wicket:message="value:PageForgetPassword.resetPassword"/>
+						<div class="pull-right">
+							<a class="btn btn-default" wicket:id="back">
+                        		 <label class="col-md-4 col-lg-4 control-label">
+		                             <wicket:message key="pageAdminFocus.button.back"/>
+		                         </label>
+                        	</a>
+
+                        	<a class="btn btn-primary" wicket:id="submitButton">
+                        		 <label class="col-md-4 col-lg-4 control-label">
+		                             <wicket:message key="PageForgetPassword.resetPassword"/>
+		                         </label>
+                        	</a>
+
+                        </div>
                     </form>
+
+                    <div style="text-align: center">
+				<h2 wicket:id="resetPasswordInfo"></h2>
+			</div>
                 </div>
+
             </div>
         </div>
+
+
     </div>