[client] Formatting/Wording/Layout of lecture details and netrules improved

1 files changed, 54 insertions, 56 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
index 54b0536d..fbf04ad1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
@@ -17,7 +17,6 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSpinner;
@@ -77,7 +76,6 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 	protected final JTextField txtId;
 	protected final QLabel lblUseCount;
 
-	protected final JButton btnPermissions;
 	protected final JButton btnNetrules;
 
 	protected final QLabel lblError;
@@ -91,7 +89,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 	protected final JSpinner spnEndTime;
 
 	protected Color dateTimeTextColor;
-	
+
 	protected JTabbedPane pnlTabs;
 	protected final LectureCustomPermissionManager ctlPermissionManager;
 	protected final LocationSelector ctlLocationSelector;
@@ -115,20 +113,17 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 	}
 
 	public LectureDetailsWindowLayout(Frame modalParent) {
-		super(modalParent, "Veranstaltungsdetails",
-				ModalityType.APPLICATION_MODAL);
+		super(modalParent, "Veranstaltungsdetails", ModalityType.APPLICATION_MODAL);
 		setResizable(true);
 		setPreferredSize(Gui.getScaledDimension(525, 550));
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
 		setLayout(new BorderLayout());
-		((JPanel) getContentPane()).setBorder(BorderFactory.createEmptyBorder(
-				10, 10, 10, 10));
+		((JPanel) getContentPane()).setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 
 		pnlTabInfo = new JPanel();
 		pnlTabInfo.setBorder(BorderFactory.createEmptyBorder(25, 25, 25, 25));
-		GridManager grdInfo = new GridManager(pnlTabInfo, 3, true, new Insets(7,
-				7, 7, 7));
-		
+		GridManager grdInfo = new GridManager(pnlTabInfo, 3, true, new Insets(7, 7, 7, 7));
+
 		// title
 		lblTitleInfo = new QLabel();
 		lblTitleInfo.setFont(lblTitleInfo.getFont().deriveFont(Font.BOLD,
@@ -177,8 +172,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 
 		pnlTabGeneral = new JPanel();
 		pnlTabGeneral.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-		GridManager grdGeneral = new GridManager(pnlTabGeneral, 5, true,
-				new Insets(3, 3, 3, 3));
+		GridManager grdGeneral = new GridManager(pnlTabGeneral, 5, true, new Insets(3, 3, 3, 3));
 		// lecture title
 		txtTitle = new JTextArea();
 		grdGeneral.add(new QLabel("Name"));
@@ -189,10 +183,8 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		txtDescription = new JTextArea();
 		txtDescription.setLineWrap(true);
 		txtDescription.setWrapStyleWord(true);
-		grdGeneral.add(new QLabel("Beschreibung")).anchor(
-				GridBagConstraints.FIRST_LINE_START);
-		JScrollPane jsp = new JScrollPane(txtDescription,
-				JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+		grdGeneral.add(new QLabel("Beschreibung")).anchor(GridBagConstraints.FIRST_LINE_START);
+		JScrollPane jsp = new JScrollPane(txtDescription, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		jsp.setMinimumSize(Gui.getScaledDimension(450, 120));
 		jsp.setPreferredSize(Gui.getScaledDimension(450, 120));
@@ -202,8 +194,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		// ID. NOTE: currently disabled
 		txtId = new JTextField();
 		txtId.setEditable(false);
-		txtId.setFont(txtId.getFont().deriveFont(Font.BOLD,
-				txtId.getFont().getSize2D() * 0.66f));
+		txtId.setFont(txtId.getFont().deriveFont(Font.BOLD, txtId.getFont().getSize2D() * 0.66f));
 		grdGeneral.add(new QLabel("ID"));
 		grdGeneral.add(txtId, 4).expand(true, false).fill(true, false);
 		grdGeneral.nextRow();
@@ -216,13 +207,12 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		grdGeneral.add(btnChangeOwner).fill(true, false);
 		grdGeneral.nextRow();
 
-
 		// linked image
 		// name
 		txtImageName = new QLabel();
 		grdGeneral.add(new QLabel("Verknüpfte VM"));
 		grdGeneral.add(txtImageName, 3).expand(true, false);
-		
+
 		// link button for image
 		btnLinkImage = new JButton("Ändern");
 		grdGeneral.add(btnLinkImage).fill(true, false);
@@ -241,14 +231,12 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 						if (item.isValid) {
 							return FormatHelper.longDate(item.getCreateTime());
 						} else {
-							return FormatHelper.longDate(item.getCreateTime())
-									+ " [ungültig]";
+							return FormatHelper.longDate(item.getCreateTime()) + " [ungültig]";
 						}
 					}
 				});
 		btnDownloadImage = new JButton("Download");
-		btnDownloadImage
-				.setToolTipText("Momentan verwendete Version herunterladen");
+		btnDownloadImage.setToolTipText("Momentan verwendete Version herunterladen");
 		JPanel versionPanel = new JPanel(new BorderLayout());
 		versionPanel.add(cboVersions, BorderLayout.CENTER);
 		versionPanel.add(chkAutoUpdate, BorderLayout.SOUTH);
@@ -259,10 +247,8 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 
 		// start time of the lecture
 		JPanel startTimePanel = new JPanel();
-		startTimePanel.setLayout(new BoxLayout(startTimePanel,
-				BoxLayout.LINE_AXIS));
-		dtpStartDate = new QDatePickerImpl(new JDatePanelImpl(
-				new UtilDateModel(new Date()), pickerStrings),
+		startTimePanel.setLayout(new BoxLayout(startTimePanel, BoxLayout.LINE_AXIS));
+		dtpStartDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
 				new DateLabelFormatter());
 		spnStartTime = makeTimeSpinner(23, 59);
 		startTimePanel.add(dtpStartDate);
@@ -275,10 +261,9 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 
 		// end time of the lecture
 		JPanel endTimePanel = new JPanel();
-		endTimePanel
-				.setLayout(new BoxLayout(endTimePanel, BoxLayout.LINE_AXIS));
-		dtpEndDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(
-				new Date()), pickerStrings), new DateLabelFormatter());
+		endTimePanel.setLayout(new BoxLayout(endTimePanel, BoxLayout.LINE_AXIS));
+		dtpEndDate = new QDatePickerImpl(new JDatePanelImpl(new UtilDateModel(new Date()), pickerStrings),
+				new DateLabelFormatter());
 		spnEndTime = makeTimeSpinner(00, 59);
 		endTimePanel.add(dtpEndDate);
 		endTimePanel.add(spnEndTime);
@@ -296,35 +281,49 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		grdGeneral.finish(true);
 
 		pnlTabRestrictions = new JPanel();
-		GridManager grdRestrictions = new GridManager(pnlTabRestrictions, 3, true,
-				new Insets(3, 3, 3, 3));
+		GridManager grdRestrictions = new GridManager(pnlTabRestrictions, 2, true, new Insets(9, 4, 2, 4));
+		Insets descriptionInset = new Insets(2, 4, 2, 4);
+		Insets firstInset = new Insets(12, 4, 2, 4);
 
 		// "restrictions": internet access / usb access / exam
-		grdRestrictions.add(new JLabel("Internetzugriff"));
-		btnNetrules = new JButton("Ausnahmen");
-		chkHasInternetAccess = new JCheckBox("zulassen");
-		grdRestrictions.add(new WordWrapLabel("Legen Sie hier fest, ob die Veranstaltung Zugriff zum Internet haben soll", false, true), 2).fill(true, false).expand(true, false);
+		chkHasInternetAccess = new JCheckBox("Netzwerk-/Internetzugriff zulassen");
+		btnNetrules = new JButton("Ausnahmen...");
+		grdRestrictions.add(chkHasInternetAccess).fill(true, false).expand(true, false).insets(firstInset);
+		grdRestrictions.add(btnNetrules).fill(true, false).expand(true, false).insets(firstInset);
 		grdRestrictions.nextRow();
-		grdRestrictions.skip();
-		grdRestrictions.add(chkHasInternetAccess).fill(true, false).expand(true, false);
-		grdRestrictions.add(btnNetrules).fill(true, false).expand(true, false);
+		grdRestrictions.add(
+				new WordWrapLabel(
+						"Legen Sie hier fest, ob die Veranstaltung Zugriff zum Internet haben soll."
+								+ " Unter 'Ausnahmen' können Sie bestimmte Adressen und Services"
+								+ " ein- oder ausschließen.", false, true), 2)
+				.fill(true, false)
+				.expand(true, false)
+				.insets(descriptionInset);
 		grdRestrictions.nextRow();
 
-		grdRestrictions.add(new JLabel("Speichermedien"));
-		chkHasUsbAccess = new JCheckBox("zulassen");
-		grdRestrictions.add(new WordWrapLabel("Legen Sie hier fest, ob die Veranstaltung den Zugriff auf Speichermedien (CD, USB, ...) erlauben soll", false, true), 2).fill(true, false).expand(true, false);
-		grdRestrictions.nextRow();
-		grdRestrictions.skip();
+		chkHasUsbAccess = new JCheckBox("Externe Speichermedien zulassen");
 		grdRestrictions.add(chkHasUsbAccess, 2);
 		grdRestrictions.nextRow();
-
-		grdRestrictions.add(new JLabel("Prüfung"));
-		chkIsExam = new JCheckBox("aktiv");
-		grdRestrictions.add(new WordWrapLabel("Markieren Sie diese Veranstaltung als E-Prüfung", false, true), 2).fill(true, false).expand(true, false);
+		grdRestrictions.add(
+				new WordWrapLabel("Legen Sie hier fest, ob die Veranstaltung den Zugriff"
+						+ " auf Speichermedien (CD, USB, ...) erlauben soll", false, true), 2)
+				.fill(true, false)
+				.expand(true, false)
+				.insets(descriptionInset);
 		grdRestrictions.nextRow();
-		grdRestrictions.skip();
+
+		chkIsExam = new JCheckBox("Prüfungsmodus");
 		grdRestrictions.add(chkIsExam, 2);
-		btnPermissions = new JButton("Ändern");
+		grdRestrictions.nextRow();
+		grdRestrictions.add(
+				new WordWrapLabel(
+						"Markieren Sie diese Veranstaltung als E-Prüfung.\n"
+								+ "Die Veranstaltung wird nur dann startbar sein, wenn bwLehrpool in den"
+								+ " Prüfungsmodus versetzt wird. Kontaktieren Sie dazu Ihren lokalen bwLehrpool-Administrator.",
+						false, true), 2)
+				.fill(true, false)
+				.expand(true, false)
+				.insets(descriptionInset);
 		grdRestrictions.finish(true);
 
 		/* *******************************************************************************	
@@ -353,7 +352,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		 ********************************************************************************/
 		ctlLocationSelector = new LocationSelector();
 		pnlTabLocations = new JPanel();
-		GridManager grdLocations = new GridManager(pnlTabLocations, 1, false); 
+		GridManager grdLocations = new GridManager(pnlTabLocations, 1, false);
 		grdLocations.add(ctlLocationSelector).fill(true, true).expand(true, true);
 		grdLocations.finish(false);
 
@@ -364,7 +363,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		 ********************************************************************************/
 		ctlRunscriptConfigurator = new RunscriptConfigurator();
 		pnlTabRunscript = new JPanel();
-		GridManager grdAdvanced = new GridManager(pnlTabRunscript, 1, false); 
+		GridManager grdAdvanced = new GridManager(pnlTabRunscript, 1, false);
 		grdAdvanced.add(ctlRunscriptConfigurator).fill(true, true).expand(true, true);
 		grdAdvanced.finish(false);
 
@@ -413,8 +412,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		model.setValue(calendar.getTime());
 		JSpinner spinner = new JSpinner(model);
 		JSpinner.DateEditor editor = new JSpinner.DateEditor(spinner, "HH:mm");
-		DateFormatter formatter = (DateFormatter) editor.getTextField()
-				.getFormatter();
+		DateFormatter formatter = (DateFormatter) editor.getTextField().getFormatter();
 		formatter.setAllowsInvalid(false);
 		formatter.setOverwriteMode(true);
 		spinner.setEditor(editor);