Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module

1 files changed, 49 insertions, 2 deletions

diff --git a/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java b/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java
index 10dafdf0..e5470a9f 100644
--- a/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java
@@ -145,16 +145,63 @@ public class PermissionEditLecture_GUI extends JFrame {
 		getContentPane().add(contentPanel);
 		contentPanel.setLayout(null);
 		
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(10, 67, 557, 129);
+		contentPanel.add(panel);
+		
+		JLabel label = new JLabel("Read");
+		label.setBounds(20, 18, 90, 20);
+		panel.add(label);
+		
+		JLabel label_3 = new JLabel("Write");
+		label_3.setBounds(20, 38, 90, 20);
+		panel.add(label_3);
+		
+		JLabel label_4 = new JLabel("ChangePermission");
+		label_4.setBounds(20, 58, 90, 20);
+		panel.add(label_4);
+		
+		JLabel label_5 = new JLabel("Admin");
+		label_5.setBounds(20, 78, 90, 20);
+		panel.add(label_5);
+		
+		JLabel label_6 = new JLabel("Link_allowed");
+		label_6.setBounds(20, 98, 90, 20);
+		panel.add(label_6);
+		
+		JLabel label_7 = new JLabel("Image darf gelesen und gestartet werden und ist in Suchfenster sichtbar.");
+		label_7.setBounds(120, 18, 380, 20);
+		panel.add(label_7);
+		
+		JLabel label_8 = new JLabel("Image darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
+		label_8.setBounds(120, 38, 380, 20);
+		panel.add(label_8);
+		
+		JLabel label_9 = new JLabel("Berechtigungen für das Image dürfen geändert werden.");
+		label_9.setBounds(120, 58, 380, 20);
+		panel.add(label_9);
+		
+		JLabel label_10 = new JLabel("Volle Rechte: write + changePermission + löschen.");
+		label_10.setBounds(120, 78, 380, 20);
+		panel.add(label_10);
+		
+		JLabel label_11 = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
+		label_11.setBounds(120, 98, 380, 20);
+		panel.add(label_11);
+		
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
 		panel_1.setBorder(new TitledBorder(null, "Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 75, 557, 445);
+		panel_1.setBounds(10, 207, 557, 313);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 		
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 413);
+		scrollPane.setBounds(10, 21, 537, 281);
 		panel_1.add(scrollPane);
 		
 		table = new JTable();