summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/intro
diff options
context:
space:
mode:
authorNino Breuer2014-11-24 15:23:29 +0100
committerNino Breuer2014-11-24 15:23:29 +0100
commitb7a385f41b1d3acebed1e64ae92fb6c873cd5ace (patch)
tree5145286dddd5e63ba899477d2b164500f32a738f /dozentenmodul/src/main/java/gui/intro
parent• started changing the authentification (diff)
parent• Some changes in text after feedback from Admins (diff)
downloadtutor-module-b7a385f41b1d3acebed1e64ae92fb6c873cd5ace.tar.gz
tutor-module-b7a385f41b1d3acebed1e64ae92fb6c873cd5ace.tar.xz
tutor-module-b7a385f41b1d3acebed1e64ae92fb6c873cd5ace.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java/gui/intro')
-rw-r--r--dozentenmodul/src/main/java/gui/intro/Login_GUI.java4
-rw-r--r--dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 5bbe2b59..17de8772 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -242,7 +242,7 @@ public class Login_GUI extends JFrame {
panel_1 = new JPanel();
panel_1.setLayout(null);
panel_1.setBorder(new TitledBorder(
- UIManager.getBorder("TitledBorder.border"), "Zugangsart",
+ UIManager.getBorder("TitledBorder.border"), "Authentifizierungsart",
TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0)));
panel_1.setBackground(SystemColor.menu);
panel_1.setBounds(10, 143, 334, 181);
@@ -251,7 +251,7 @@ public class Login_GUI extends JFrame {
// group radio button for the login type together
bgLoginType = new ButtonGroup();
- rdbtnBwIDM = new JRadioButton("Zugang über bwIDM");
+ rdbtnBwIDM = new JRadioButton("Authentifizierung über bwIDM");
rdbtnBwIDM.setBounds(32, 35, 244, 23);
rdbtnBwIDM.setActionCommand(LOGIN_TYPE_BWIDM);
rdbtnBwIDM.addActionListener(loginTypeActionListener);
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 45bdf9c6..bd69571e 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -113,7 +113,7 @@ public class MainMenue_GUI extends JFrame {
e.printStackTrace();
}
setTitle("bwLehrpool Suite - Connected Server: "
- + SessionData.session.getServerAdress());
+ + SessionData.session.getServerAdress()+" - "+person.verantwortlicher.getUserID());
setBounds(0, 0, 603, 722);
this.setLocationRelativeTo(formerGUI);