Some GUI design improvements

Evolveum · Jan 11, 2016 · b8d32bc · b8d32bc
1 parent f8c18e9
commit b8d32bc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java
@@ -80,6 +80,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@Deprecated
 public abstract class BaseFocusPanel<F extends FocusType> extends Panel {
 	private static final long serialVersionUID = 1L;
 

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusAssignmentsTabPanel.html b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusAssignmentsTabPanel.html
@@ -20,7 +20,7 @@
 <body>
 	<wicket:panel>
 		<div class="row">
-			<div class="col-md-6">
+			<div class="col-md-12">
 				<div wicket:id="assignmentsContainer" about="assignmentsContainer">
 						<div wicket:id="assignmentsPanel" />
 				</div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusDetailsTabPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusDetailsTabPanel.html
@@ -20,10 +20,10 @@
 <body>
 	<wicket:panel>
 		<div class="row">
-			<div class="col-md-6">
-				<div wicket:id="focusForm" />
+			<div class="col-md-12">
+				<div wicket:id="focusDetails" />
 			</div>
-			<div class="col-md-6">
+			<div class="col-md-12">
                 <div wicket:id="tasks">
                     <h3><wicket:message key="pageUser.tasks"/></h3>
                     <div wicket:id="taskTable"/>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusDetailsTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusDetailsTabPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,6 +86,8 @@
 public class FocusDetailsTabPanel<F extends FocusType> extends FocusTabPanel {
 	private static final long serialVersionUID = 1L;
 
+	protected static final String ID_FOCUS_FORM = "focusDetails";
+
 	protected static final String ID_TASK_TABLE = "taskTable";
 	protected static final String ID_TASKS = "tasks";
 
@@ -98,15 +100,15 @@ public FocusDetailsTabPanel(String id, Form mainForm, LoadableModel<ObjectWrappe
 
 	private void initLayout() {
 
-		PrismObjectPanel userForm = new PrismObjectPanel<F>(ID_FOCUS_FORM, getFocusModel(),
+		PrismObjectPanel panel = new PrismObjectPanel<F>(ID_FOCUS_FORM, getFocusModel(),
 				new PackageResourceReference(ImgResources.class, ImgResources.USER_PRISM), getMainForm(), getPageBase()) {
 
 			@Override
 			protected IModel<String> createDescription(IModel<ObjectWrapper<F>> model) {
 				return createStringResource("pageAdminFocus.description");
 			}
 		};
-		add(userForm);
+		add(panel);
 
 		WebMarkupContainer tasks = new WebMarkupContainer(ID_TASKS);
 		tasks.setOutputMarkupId(true);

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusProjectionsTabPanel.html b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusProjectionsTabPanel.html
@@ -20,7 +20,7 @@
 <body>
 	<wicket:panel>
 		<div class="row">
-			<div class="col-md-6">
+			<div class="col-md-12">
 				<div wicket:id="shadows">
 					<div class="row assignable-header">
 						<div class="col-xs-10">

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/FocusTabPanel.java
@@ -95,7 +95,6 @@ public abstract class FocusTabPanel<F extends FocusType> extends Panel {
 	public static final String AUTH_ORG_ALL_DESCRIPTION = "PageAdminUsers.auth.orgAll.description";
 
 	protected static final String ID_MAIN_FORM = "mainForm";
-	protected static final String ID_FOCUS_FORM = "focusForm";
 
 	private static final Trace LOGGER = TraceManager.getTrace(FocusTabPanel.class);