diff options
| author | Nino Breuer | 2014-12-01 16:30:59 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-12-01 16:30:59 +0100 |
| commit | 6a90495ac046d90a749ec2ec152ffdf4d7d603f0 (patch) | |
| tree | 625e5d14802ad1d3d847ab1895edd85a48167e95 /dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java | |
| parent | • changed implementation of user authentication. (diff) | |
| parent | • Admin can download any image (diff) | |
| download | tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.tar.gz tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.tar.xz tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
möp. großes geschrei, fehler bitte an mich.
dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
dozentenmodulserver/src/main/java/server/ServerHandler.java
dozentenmodulserver/src/main/java/server/generated/Server.java
dozentenmodulserver/thrift/server.thrift
Diffstat (limited to 'dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index 52e9746a..40956d88 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -75,7 +75,7 @@ public class PermissionEditLecture_GUI extends JFrame { String[] result; private JTable table; private Class[] classes; - Object[] titles = { "Name", "Read", "Write", "Admin", "userID" }; + Object[] titles = { "Name", "Lesen", "Schreiben", "Admin", "userID" }; private List<Person> map = null; // List of people who have rights Component c = null; private static final String HELP_MESSAGE = "<html><div align=\"center\">" @@ -128,7 +128,7 @@ public class PermissionEditLecture_GUI extends JFrame { e.printStackTrace(); } - setTitle("bwLehrpool Suite - Berechtigungen"); + setTitle("bwLehrpool Suite - Berechtigungen - "+person.verantwortlicher.getUserID()); setBounds(0, 0, 603, 722); setLocationRelativeTo(formerGUI); @@ -170,32 +170,32 @@ public class PermissionEditLecture_GUI extends JFrame { panel.setBounds(10, 35, 557, 130); contentPanel.add(panel); - JLabel label = new JLabel("Read"); - label.setBounds(28, 18, 90, 20); - panel.add(label); + JLabel lblLesen = new JLabel("Lesen"); + lblLesen.setBounds(28, 18, 90, 20); + panel.add(lblLesen); JLabel lblVeranstaltungIstIn = new JLabel( "Veranstaltung ist in bwLehrpool Suite und VMchooser für sichtbar."); - lblVeranstaltungIstIn.setBounds(128, 18, 380, 20); + lblVeranstaltungIstIn.setBounds(128, 18, 419, 20); panel.add(lblVeranstaltungIstIn); - JLabel label_4 = new JLabel("Write"); - label_4.setBounds(28, 38, 90, 20); - panel.add(label_4); + JLabel lblSchreiben = new JLabel("Schreiben"); + lblSchreiben.setBounds(28, 38, 90, 20); + panel.add(lblSchreiben); JLabel label_5 = new JLabel( - "<HTML>Veranstaltung darf angepasst und überschrieben, jedoch nicht gelöscht werden. Berechtigungen für andere Benutzer festlegen</HTML>"); - label_5.setBounds(128, 38, 380, 45); + "Veranstaltung darf angepasst und überschrieben, jedoch nicht gelöscht werden."); + label_5.setBounds(128, 38, 419, 20); panel.add(label_5); JLabel label_6 = new JLabel("Admin"); - label_6.setBounds(28, 78, 90, 20); + label_6.setBounds(28, 58, 90, 20); panel.add(label_6); - JLabel label_7 = new JLabel( - "<HTML>Volle Rechte: read, write, löschen und Berechtigungen für andere Benutzer festlegen.</HTML>"); - label_7.setBounds(128, 78, 380, 40); - panel.add(label_7); + JLabel lblvolleRechteLesen = new JLabel( + "<HTML>Volle Rechte: Lesen, Schreiben, Löschen und Berechtigungen für andere Benutzer festlegen.</HTML>"); + lblvolleRechteLesen.setBounds(128, 58, 419, 35); + panel.add(lblvolleRechteLesen); JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); |