[client] Fix LectureCreationPageLayout layout

2 files changed, 22 insertions, 18 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridPos.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridPos.java
index f91bb820..82871fec 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridPos.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GridPos.java
@@ -5,7 +5,7 @@ import java.awt.Insets;
 
 public class GridPos {
 
-	private static final Insets inset = new Insets(2, 2, 2, 2);
+	private static final Insets inset = new Insets(1, 1, 1, 1);
 
 	public static GridBagConstraints get(int cellX, int cellY, int spanX, int spanY, boolean fillX,
 			boolean fillY) {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
index b7684a1f..458fc729 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureCreationPageLayout.java
@@ -64,21 +64,23 @@ public abstract class LectureCreationPageLayout extends WizardPage {
 
 		// helper index
 		int row = 0;
-		
+
 		// lecture name
 		JLabel lectureNameLabel = new JLabel("Veranstaltungsname");
 		lectureNameTextField = new JTextField();
 		add(lectureNameLabel, GridPos.get(0, row));
 		add(lectureNameTextField, GridPos.get(1, row++, 2, 1, true, false));
-		
+
 		JLabel descriptionCaption = new JLabel("Beschreibung");
-		descriptionText = new JTextArea();
+		descriptionText = new JTextArea(3, 50);
 		descriptionText.setLineWrap(true);
 		descriptionText.setWrapStyleWord(true);
 		JScrollPane descPane = new JScrollPane(descriptionText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		descriptionText.setMinimumSize(new Dimension(0, 60));
+		descPane.setMinimumSize(descriptionText.getMinimumSize());
 		add(descriptionCaption, GridPos.get(0, row));
-		add(descPane, GridPos.get(1, row++, 2, 1, true, true));
+		add(descPane, GridPos.get(1, row++, 2, 1, true, false));
 
 		// Start date/time
 		JLabel startDateLabel = new JLabel("Startdatum");
@@ -86,8 +88,8 @@ public abstract class LectureCreationPageLayout extends WizardPage {
 				new DateLabelFormatter());
 		startTime = makeTimeSpinner(0, 0);
 		add(startDateLabel, GridPos.get(0, row));
-		add(startDate, GridPos.get(1, row, 2, 1, false, false));
-		add(startTime, GridPos.get(2, row++, 1, 1, false, false));
+		add(startDate, GridPos.get(1, row));
+		add(startTime, GridPos.get(2, row++));
 
 		JLabel endDateLabel = new JLabel("Enddatum");
 		endDate = new JDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
@@ -97,18 +99,20 @@ public abstract class LectureCreationPageLayout extends WizardPage {
 		add(endDate, GridPos.get(1, row));
 		add(endTime, GridPos.get(2, row++));
 
-		add(Box.createVerticalStrut(10), GridPos.get(0, row++));
+		add(Box.createVerticalStrut(10), GridPos.get(0, row++, 3, 1));
 
 		// Options related to exams
 		examCheck = new JCheckBox("Veranstaltung ist eine Prüfung");
-		add(examCheck, GridPos.get(1, row++, 2, 1));
-		
+		add(examCheck, GridPos.get(0, row++, 3, 1));
+
 		networkAccessCheck = new JCheckBox("Internet verfügbar");
-		add(networkAccessCheck, GridPos.get(1, row++, 2, 1));
-		
+		add(networkAccessCheck, GridPos.get(0, row++, 3, 1));
+
 		autoUpdate = new JCheckBox("Aktuellste Imageversion verwenden");
-		add(autoUpdate, GridPos.get(1, row++, 2, 1));
-		add(Box.createRigidArea(new Dimension(0, 20)));
+		add(autoUpdate, GridPos.get(0, row++, 3, 1));
+
+		add(Box.createVerticalStrut(10), GridPos.get(0, row++, 3, 1));
+
 		// -- default permissions group --
 		JPanel permissionsGroup = new JPanel();
 		permissionsGroup.setBorder(new TitledBorder("Standardberechtigungen"));
@@ -117,10 +121,10 @@ public abstract class LectureCreationPageLayout extends WizardPage {
 		adminPermissionsCheck = new JCheckBox("Administrieren");
 		permissionsGroup.add(editPermissionsCheck);
 		permissionsGroup.add(adminPermissionsCheck);
-		add(permissionsGroup, GridPos.get(1, row++, 2, 1));
-		enabledCheck = new JCheckBox("Aktiviert");
-		add(enabledCheck, GridPos.get(1, row++, 2, 1));
-		add(Box.createVerticalGlue(), GridPos.get(0, row++, true, true));
+		add(permissionsGroup, GridPos.get(0, row++, 3, 1, true, false));
+		enabledCheck = new JCheckBox("Vorlesung ist aktiv", true);
+		add(enabledCheck, GridPos.get(0, row++, 3, 1));
+		add(Box.createVerticalGlue(), GridPos.get(0, row++, 3, 1, true, true));
 	}
 
 	private JSpinner makeTimeSpinner(int h, int m) {