Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 3, 2016 · 30de6a0 · 30de6a0
2 parents 8788c8b + a1d78ae
commit 30de6a0
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 76 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,13 +11,13 @@ script: travis_wait 120 mvn clean install
 
 addons:
   hostname: localhost # workaround for short hostname
-  apt:
-    packages:
-      - oracle-java8-installer # install newest JDK8
+  #apt:
+   # packages:
+    #  - oracle-java8-installer # install newest JDK8
       #- openjdk-8-jdk
 
 jdk:
   - openjdk7
   - oraclejdk7
   #- openjdk8
-  - oraclejdk8
+  #- oraclejdk8
diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html b/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html
@@ -17,16 +17,16 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-	<a class="btn btn-app" data-toggle="dropdown"> 
-		<span class="badge bg-teal" wicket:id="info"></span> 
-		<i class="fa " wicket:id="icon"></i> 
-		<label wicket:id="label" ></label>
-	</a>
-	               <ul class="dropdown-menu pull-right" role="menu">
-                <li wicket:id="menuItem">
-                    <div wicket:id="menuItemBody"/>
-                </li>
-            </ul>
-
+    <a class="btn btn-app" data-toggle="dropdown">
+        <span class="badge bg-teal" wicket:id="info"></span>
+        <i class="fa " wicket:id="icon"></i>
+        <label wicket:id="label"></label>
+        &nbsp;<span class="caret"/>
+    </a>
+    <ul class="dropdown-menu pull-right" role="menu">
+        <li wicket:id="menuItem">
+            <div wicket:id="menuItemBody"/>
+        </li>
+    </ul>
 </wicket:panel>
 </html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -60,7 +60,7 @@
     <div class="wrapper">
         <header class="main-header">
             <!-- Logo -->
-            <a class="logo" href="./">
+            <a class="logo" wicket:id="logo">
                 <span>&nbsp;</span>
             </a>
             <!-- Header Navbar: style can be found in header.less -->

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
@@ -119,6 +119,7 @@
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -173,6 +174,8 @@ public abstract class PageBase extends WebPage implements ModelServiceLocator {
 	private static final String ID_BC_NAME = "bcName";
 	private static final String ID_MAIN_POPUP = "mainPopup";
 	private static final String ID_MAIN_POPUP_BODY = "popupBody";
+	private static final String ID_LOGO = "logo";
+
     private static final String OPERATION_GET_SYSTEM_CONFIG = DOT_CLASS + "getSystemConfiguration";
 
 	private static final Trace LOGGER = TraceManager.getTrace(PageBase.class);
@@ -512,6 +515,19 @@ public boolean isVisible() {
 	}
 
 	private void initLayout() {
+		AjaxLink logo = new AjaxLink(ID_LOGO) {
+
+			@Override
+			public void onClick(AjaxRequestTarget target) {
+				SessionStorage storage = MidPointAuthWebSession.getSession().getSessionStorage();
+				storage.clearBreadcrumbs();
+
+				Class<? extends Page> page = MidPointApplication.get().getHomePage();
+				setResponsePage(page);
+			}
+		};
+		add(logo);
+
 		Label title = new Label(ID_TITLE, createPageTitleModel());
 		title.setRenderBodyOnly(true);
 		add(title);
@@ -1426,6 +1442,8 @@ public AdminGuiConfigurationType loadAdminGuiConfiguration() {
 	public void redirectBack() {
 		List<Breadcrumb> breadcrumbs = getSessionStorage().getBreadcrumbs();
 		if (breadcrumbs.size() < 2) {
+			getSessionStorage().clearBreadcrumbs();
+
 			if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
 					AuthorizationConstants.AUTZ_UI_HOME_ALL_URL)) {
 				setResponsePage(PageDashboard.class);

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html b/...src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html
@@ -17,49 +17,46 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-	<div class="container">
-		<div class="row form-horizontal resource-content-selection">
-
-			<div class="col-md-7">
-				<div class="form-group">
-					<wicket:enclosure child="intent">
-						<label class="col-md-2 control-label"><wicket:message key="ShadowType.intent"/></label>
-						<div class="col-md-4" wicket:id="intent" />
-						<wicket:enclosure child="realObjectClass">
-							<span class="col-md-6 control-label control-suffix">(<wicket:message key="ShadowType.objectClass"/>: <span wicket:id="realObjectClass"/>)</span>
-						</wicket:enclosure>
+	<div class="row form-horizontal resource-content-selection">
+		<div class="col-md-7">
+			<div class="form-group">
+				<wicket:enclosure child="intent">
+					<label class="col-md-2 control-label"><wicket:message key="ShadowType.intent"/></label>
+					<div class="col-md-4" wicket:id="intent" />
+					<wicket:enclosure child="realObjectClass">
+						<span class="col-md-6 control-label control-suffix">(<wicket:message key="ShadowType.objectClass"/>: <span wicket:id="realObjectClass"/>)</span>
 					</wicket:enclosure>
-					<wicket:enclosure child="objectClass">
-						<label class="col-md-2 control-label"><wicket:message key="ShadowType.objectClass"/></label>
-						<div class="col-md-10" wicket:id="objectClass" />
-					</wicket:enclosure>
-				</div>
+				</wicket:enclosure>
+				<wicket:enclosure child="objectClass">
+					<label class="col-md-2 control-label"><wicket:message key="ShadowType.objectClass"/></label>
+					<div class="col-md-10" wicket:id="objectClass" />
+				</wicket:enclosure>
 			</div>
-			
-			<div class="col-md-1"></div>
-			
-			<div class="col-md-4">
-				<div class="form-group">
-					<label class="col-md-4 control-label"><wicket:message key="ResourceContentTabPanel.searchType" /></label>
-					<div class="btn-group col-md-6">
-						<a class="btn btn-sm btn-default" wicket:id="repositorySearch"> 
-							<wicket:message key="ResourceContentTabPanel.searchType.repository" />
-						</a>
-						<a class="btn btn-sm btn-default" wicket:id="resourceSearch"> 
-							<wicket:message key="ResourceContentTabPanel.searchType.resource" />
-						</a>
-					</div>
+		</div>
+
+		<div class="col-md-1"></div>
+
+		<div class="col-md-4">
+			<div class="form-group">
+				<label class="col-md-4 control-label"><wicket:message key="ResourceContentTabPanel.searchType" /></label>
+				<div class="btn-group col-md-6">
+					<a class="btn btn-sm btn-default" wicket:id="repositorySearch">
+						<wicket:message key="ResourceContentTabPanel.searchType.repository" />
+					</a>
+					<a class="btn btn-sm btn-default" wicket:id="resourceSearch">
+						<wicket:message key="ResourceContentTabPanel.searchType.resource" />
+					</a>
 				</div>
 			</div>
-
 		</div>
-
-		<div class="row">
+	</div>
+
+	<div class="row">
+		<div class="col-md-12">
 			<form wicket:id="mainForm">
-					<div wicket:id="table" />
+				<div wicket:id="table" />
 			</form>
 		</div>
 	</div>
-
 </wicket:panel>
 </html>
diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java b/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
@@ -232,20 +232,11 @@ private void savePerformed(AjaxRequestTarget target) {
         } else {
             showResult(result);
 
-            returnToAccountList();
+            redirectBack();
         }
     }
 
     private void cancelPerformed(AjaxRequestTarget target) {
-        returnToAccountList();
-    }
-
-    private void returnToAccountList() {
-        PrismObject<ShadowType> account = accountModel.getObject().getObject();
-        ResourceType resource = account.asObjectable().getResource();
-
-        PageParameters parameters = new PageParameters();
-        parameters.add(OnePageParameterEncoder.PARAMETER, resource.getOid());
-        setResponsePage(PageResource.class, parameters);
+        redirectBack();
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.html
@@ -33,7 +33,7 @@
 
                             <div class="col-md-8 col-lg-8">
                                 <input name="username" type="text" class="form-control input-sm focus-username"
-                                       wicket:message="placeholder:PageLogin.username">
+                                       wicket:message="placeholder:PageLogin.username" required="required">
                             </div>
                         </div>
                         <div class="form-group">
@@ -43,14 +43,18 @@
 
                             <div class="col-md-8 col-lg-8">
                                 <input name="password" type="password" class="form-control input-sm"
-                                       wicket:message="placeholder:PageLogin.password">
+                                       wicket:message="placeholder:PageLogin.password" required="required">
                             </div>
                         </div>
 
                         <input type="submit" class="btn btn-primary pull-right" wicket:message="value:PageLogin.signIn"/>
                     </form>
 
-                    <wicket:link  ><a href="forgetpassword" wicket:id="forgetpassword"> <wicket:message key="PageLogin.forgetPassword"/></a></wicket:link>
+                    <wicket:link>
+                        <a href="forgetpassword" wicket:id="forgetpassword">
+                            <wicket:message key="PageLogin.forgetPassword"/>
+                        </a>
+                    </wicket:link>
                 </div>
             </div>
         </div>

diff --git a/samples/evolveum/org-users.xml b/samples/evolveum/org-users.xml