[client] Add/fix several weblinks ->

Add FAQ URL to 'About' menu
Add 'Register' button to LoginWindow
Fix registration URL when image publishing fails

7 files changed, 36 insertions, 8 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index 51c33b0f..5fbfbd41 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -63,6 +63,8 @@ import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.util.ClientVersion;
 import org.openslx.dozmod.util.FormatHelper;
+import org.openslx.dozmod.util.OpenLinks;
+import org.openslx.dozmod.util.OpenLinks.Link;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
@@ -423,10 +425,12 @@ public abstract class MainWindow {
 
 		JMenuItem disclaimerItem = new JMenuItem("Nutzungsvereinbarung");
 		JMenuItem virtualizerNoticeItem = new JMenuItem("Virtualisierer");
+		JMenuItem wikiItem = new JMenuItem("www.bwlehrpool.de");
 		JMenuItem updateCheckItem = new JMenuItem("Software-Aktualisierung");
 		cascadeAboutMenu.add(disclaimerItem);
 		cascadeAboutMenu.add(virtualizerNoticeItem);
 		cascadeAboutMenu.addSeparator();
+		cascadeAboutMenu.add(wikiItem);
 		cascadeAboutMenu.add(updateCheckItem);
 
 		menuBar.add(Box.createHorizontalGlue());
@@ -491,6 +495,13 @@ public abstract class MainWindow {
 			}
 		});
 
+		wikiItem.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				OpenLinks.openWebpage(Link.FAQ);
+			}
+		});
+
 		updateCheckItem.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java
index d2139b2f..c2e31435 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/CheckUpdateWindow.java
@@ -22,7 +22,6 @@ public class CheckUpdateWindow extends CheckUpdateWindowLayout implements UiFeed
 
 		btnClose.addActionListener(this);
 		btnLink.addActionListener(this);
-		btnLink.setEnabled(!ClientVersion.isNewest());
 
 		lblLocalVersion.setText(ClientVersion.getLocalRevision() + " ("
 				+ FormatHelper.longDate(ClientVersion.getLocalRevTimestamp()) + ")");
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index d7542bf9..aaf342e8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -499,7 +499,10 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 					// TODO? Should we show a message? Transfer runs between master and sat, we just watch it. You could even close the client now
 				} catch (TException e1) {
 					ThriftError.showMessage(me, LOGGER, e1,
-							"Upload der VM auf den Master-Server fehlgeschlagen. Prüfen Sie, ob Sie bei der Registrierung den landesweiten Imageaustausch zugestimmt haben. Sie können dies hier überprüfen: \n" + OpenLinks.Link.DOZMOD);
+							"Upload der VM auf den Masterserver fehlgeschlagen."
+							+ " Prüfen Sie, ob Sie bei der Registrierung dem landesweiten VM-Austausch zugestimmt haben.\n"
+							+ " Sie können dies hier überprüfen:\n"
+							+ OpenLinks.Link.REGISTER_BWIDM.uri.toString() + "\n\n");
 				}
 			}
 		});
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
index 0c03df89..9e028041 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
@@ -43,6 +43,8 @@ import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.ThriftError;
 import org.openslx.dozmod.thrift.cache.OrganizationCache;
+import org.openslx.dozmod.util.OpenLinks;
+import org.openslx.dozmod.util.OpenLinks.Link;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
@@ -114,6 +116,7 @@ public class LoginWindow extends LoginWindowLayout {
 					if (e.getStateChange() == ItemEvent.SELECTED) {
 						cboOrganization.setEnabled(cboOrganization.getModel().getSize() != 0 && type == LoginType.ECP);
 						loginType = type;
+						btnOpenRegistration.setEnabled(type == LoginType.ECP);
 					}
 				}
 			});
@@ -180,6 +183,13 @@ public class LoginWindow extends LoginWindowLayout {
 				doLogin();
 			}
 		});
+		
+		btnOpenRegistration.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				OpenLinks.openWebpage(Link.REGISTER_BWIDM);
+			}
+		});
 
 		// make enter key activate login
 		pnlLoginForm.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
index bd9a3b71..cf6dbab2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
@@ -67,7 +67,7 @@ public abstract class CheckUpdateWindowLayout extends JDialog {
 		changelogPanel.setBorder(BorderFactory.createTitledBorder("Changelog"));
 
 		// checkbox for acknowledging the disclaimer
-		btnLink = new JButton("Neueste Version herunterladen");
+		btnLink = new JButton("Zum Download-Portal");
 		btnClose = new JButton(closeButtonLabel);
 		JPanel buttonPanel = new JPanel();
 		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index 3700caae..30c5c6a9 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -1,6 +1,7 @@
 package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.Frame;
+import java.awt.GridBagConstraints;
 import java.awt.Rectangle;
 
 import javax.swing.Box;
@@ -60,6 +61,7 @@ public abstract class LoginWindowLayout extends JDialog {
 	protected final JTextField txtUsername;
 	protected final JPasswordField txtPassword;
 	protected final JCheckBox chkSaveUsername;
+	protected final JButton btnOpenRegistration;
 	protected final JButton btnLogin;
 	protected final JPanel pnlLoginType;
 	protected final JPanel pnlLoginForm;
@@ -101,6 +103,7 @@ public abstract class LoginWindowLayout extends JDialog {
 		txtPassword = new JPasswordField();
 		btnLogin = new JButton("Login");
 		chkSaveUsername = new JCheckBox("Benutzername speichern");
+		btnOpenRegistration = new JButton("Registrieren");
 
 		pnlLoginType = makeLoginTypePanel();
 		grid.add(pnlLoginType).expand(0.25, 1).fill(true, true);
@@ -117,24 +120,25 @@ public abstract class LoginWindowLayout extends JDialog {
 		// login form panel
 		JPanel loginFormPanel = new JPanel();
 		loginFormPanel.setBorder(new TitledBorder(LOGIN_FORM_LABEL));
-		GridManager grid = new GridManager(loginFormPanel, 2);
+		GridManager grid = new GridManager(loginFormPanel, 3);
 
 		grid.add(new QLabel("Identity Provider"));
-		grid.add(cboOrganization).expand(true, false).fill(true, false);
+		grid.add(cboOrganization, 2).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		// label + field for username
 		grid.add(new QLabel("Benutzername"));
-		grid.add(txtUsername).expand(true, false).fill(true, false);
+		grid.add(txtUsername, 2).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		// label + field for password
 		grid.add(new QLabel("Passwort"));
-		grid.add(txtPassword).expand(true, false).fill(true, false);
+		grid.add(txtPassword, 2).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		grid.add(btnLogin);
 		grid.add(chkSaveUsername);
+		grid.add(btnOpenRegistration).anchor(GridBagConstraints.EAST);
 		grid.nextRow();
 		grid.finish(true);
 		return loginFormPanel;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java
index b8c4298c..2a181a34 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/OpenLinks.java
@@ -20,7 +20,8 @@ public class OpenLinks {
 		FAQ("https://www.bwlehrpool.de/"),
 		VMWARE("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_workstation_player/12_0"),
 		//INTRO("http://www.hs-offenburg.de/fileadmin/Einrichtungen/hrz/Projekte/bwLehrpool/3_bwLehrpool_-_Image_einbinden_und_starten.pdf"),
-		DOZMOD("https://bwlp-masterserver.ruf.uni-freiburg.de/dozmod/");		
+		DOZMOD("https://bwlp-masterserver.ruf.uni-freiburg.de/dozmod/"),
+		REGISTER_BWIDM("https://bwlp-masterserver.ruf.uni-freiburg.de/webif/");
 
 		public final URI uri;