Adding and Editing UI/UX components, multi-language was provided.

Evolveum · Jun 4, 2015 · 68b3db1 · 68b3db1
1 parent afa97b6
commit 68b3db1
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 62 deletions.
diff --git a/...s/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions_tr_TR.utf8.properties b/...s/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions_tr_TR.utf8.properties
@@ -16,5 +16,6 @@
 
 page.title=Şifre Sorularım
 message.success=Cevaplarınız Başarılı Bir Şekilde Güncellendi
+message.error=Lütfen tekrar deneyiniz
 
 
diff --git a/...rces/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword_tr_TR.utf8.properties b/...rces/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword_tr_TR.utf8.properties
@@ -0,0 +1,3 @@
+page.title=Yeni Şifre
+PageShowPassword.message = Yeni şifreniz: 
+PageShowPassword.success = Yeni şifreniz başarılı bir şekilde oluşturuldu
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.html b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.html
@@ -15,8 +15,9 @@
   ~ limitations under the License.
   -->
 
-<!DOCTYPE html>
-<html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns:wicket="http://wicket.apache.org">
 <head>
 <meta charset="ISO-8859-1">
 <title>Insert title here</title>

diff --git a/...rc/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.properties b/...rc/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.properties
@@ -15,4 +15,5 @@
 #
 
 page.title=My Password Questions
-message.success=Your Answers Were Updated Successfully
+message.success=Your Answers Were Updated Successfully
+message.error=Please try again
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
@@ -111,15 +111,15 @@ protected void onSubmit() {
 
 
 				UserType user= checkUser(email.getModelObject(),username.getModelObject() );
-				System.out.println("checkkk");
+				//System.out.println("checkkk");
 				if(user!=null){
 					//If the parameters are ok reset the password
 
 					//		PageParameters parameters = new PageParameters();
 					//	PageForgetPasswordQuestions pageForgetPasswordQuestions =new PageForgetPasswordQuestions();
 					//		pageForgetPasswordQuestions.setUserTypeObject(user);
 
-					System.out.println("pOid");
+					//System.out.println("pOid");
 					getSession().setAttribute("pOid", user.getOid());
 					getSecurityEnforcer().setupPreAuthenticatedSecurityContext((Authentication) null);
 			        setResponsePage(PageSecurityQuestions.class);
@@ -355,7 +355,7 @@ private String resetPassword(UserType user){
 
 		deltas.add(ObjectDelta.createModifyDelta(user.getOid(), delta, type, getPrismContext()));
 		try {
-			System.out.println("Reset Password5");
+			//System.out.println("Reset Password5");
 
 				getModelService().executeChanges(deltas, null, task, result);
 			setAuthenticationNull();

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.html b/...ui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.html
@@ -19,46 +19,40 @@
         "http://www.w3.org/TR/html4/loose.dtd">
 <html xmlns:wicket="http://wicket.apache.org">
 <body>
-<wicket:extend>
+	<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="mainForm" class="form-horizontal">
+		<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="mainForm" class="form-horizontal">
+							<div class="form-group">
+								<div class="col-md-10 col-lg-10 control-label">
+									<div wicket:container wicket:id="pwdQuestionsPanel">
+										<div class="col-md-12 col-lg-12">
+											<div wicket:container wicket:id="questionAnswerPanel"></div>
+										</div>
+									</div>
+									<div class="col-md-10 col-lg-10">
+										<div class="main-button-bar">
+											<span class="button-group"> <a class="btn btn-default"
+												wicket:id="back" />
+											</span> <a class="btn btn-primary" wicket:id="send" />
+										</div>
+									</div>
+								</div>
+							</div>
+						</form>
+					</div>
+				</div>
+			</div>
+		</div>
 
-<div wicket:container wicket:id="pwdQuestionsPanel">
-	<div wicket:container wicket:id="questionAnswerPanel"></div>
-</div>
-  <div class="main-button-bar">
-            <span class="button-group">
-                <a class="btn btn-default" wicket:id="back" />
-            </span>
-            <a class="btn btn-primary" wicket:id="send"/>
-        </div>
-
-
-<!-- <div wicket:id="panelRepeater">
-  <div wicket:id="pwdQuestionsPanel"></div>
-</div> -->
-<!-- 	<div class="main-button-bar">
-            <span class="button-group">
-                <a class="btn btn-default" wicket:id="back" />
-            </span>
-            <a class="btn btn-primary" wicket:id="save"/>
-    </div> -->
 
-</form> 
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-    <script type="text/javascript">
-        $(".focus-username").focus();
-    </script>
-</wicket:extend>
+		<script type="text/javascript">
+			$(".focus-username").focus();
+		</script>
+	</wicket:extend>
 
 </body>
 </html>
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.html b/...min-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.html
@@ -1,21 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
         "http://www.w3.org/TR/html4/loose.dtd">
 <html xmlns:wicket="http://wicket.apache.org">
+<head>
+<title>Insert title here</title>
+</head>
 <body>
-<wicket:extend>
+	<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;">
-
-                <h2 wicket:id="pass"></h2>
-            </div>
-        </div>
-    </div>
+		<div class="row">
+			<div class="col-md-offset-2 col-md-8 col-lg-offset-4 col-lg-3">
+				<div class="panel panel-default" style="margin-top: 120px;">
+					<div class="panel-body">
+						<div class="form-group">
+							<label class="col-md-4 col-lg-4 control-label"> 
+							<wicket:message	key="PageShowPassword.message" />
+							</label>
+							<div class="col-md-6 col-lg-6">
 
-
-
-</wicket:extend>
+								<h2 wicket:id="pass"></h2>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</wicket:extend>
 
 </body>
 </html>
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.java
@@ -11,17 +11,21 @@
 public class PageShowPassword extends PageBase{
 
 
-		
-		
+	PageBase page = (PageBase) getPage();
+
 	public PageShowPassword() {
-		 System.out.println("onload:"+getSession().getAttribute("pwdReset"));
+
+		 //System.out.println("onload:"+getSession().getAttribute("pwdReset"));
 		add(new Label("pass", getSession().getAttribute("pwdReset")));
 		getSession().removeAttribute("pwdReset");
+
+		success(getString("PageShowPassword.success"));
+	    add(getFeedbackPanel());
 	}
-		@Override
+	/*	@Override
 		protected IModel<String> createPageTitleModel() {
 			return new Model<String>("");
-		}
+		}*/
 
 
 

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.properties b/...i/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.properties
@@ -0,0 +1,3 @@
+page.title=New Password
+PageShowPassword.message = Your new password is: 
+PageShowPassword.success = New password has been successfully created
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
@@ -47,6 +47,7 @@
 @PageDescriptor(url = "/login")
 public class PageLogin extends PageBase {
 
+	PageBase page = getPageBase();
     private static final String ID_LOGIN_FORM = "loginForm";
 
     private static final String ID_USERNAME = "username";
@@ -101,10 +102,10 @@ protected void onSubmit() {
 
         add(form);
     }
-    @Override
+   /* @Override
     protected IModel<String> createPageTitleModel() {
         return new Model<>("");
-    }
+    }*/
 
 	public PageBase getPageBase() {
 		return (PageBase) getPage();