From 37e30a3d5e56008e56b77452728893ce834c2b2b Mon Sep 17 00:00:00 2001
From: Benjamin Lang <benjamin.lang@smail.inf.h-brs.de>
Date: Mon, 19 Jun 2017 14:33:33 +0200
Subject: [PATCH] =?UTF-8?q?AbbruchButton=20als=20Link=20mittig=20unterhalb?=
=?UTF-8?q?=20der=20LoginBox=20eingef=C3=BCgt.=20(Zur=20Sicherstellung=20d?=
=?UTF-8?q?er=20Anforderung,=20dass=20alle=20Vorg=C3=A4nge=20abbrechbar=20?=
=?UTF-8?q?sein=20sollen)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/org/s4s/gui/views/LoginView.java | 25 ++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/s4s/gui/views/LoginView.java b/src/main/java/org/s4s/gui/views/LoginView.java
index fddbd26..e138fd3 100644
--- a/src/main/java/org/s4s/gui/views/LoginView.java
+++ b/src/main/java/org/s4s/gui/views/LoginView.java
@@ -4,6 +4,7 @@ import com.vaadin.navigator.ViewChangeListener;
import com.vaadin.server.FontAwesome;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.*;
+import com.vaadin.ui.themes.ValoTheme;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.s4s.dao.KundenDAO;
@@ -53,19 +54,34 @@ public class LoginView extends TemplateView {
Button button = new Button("Login", FontAwesome.BEER);
Button buttonReg = new Button("Registrieren", FontAwesome.BEER);
+ Button abbruch = new Button("Abbruch");
+ abbruch.setIcon(FontAwesome.STOP_CIRCLE);
+ abbruch.addStyleName(ValoTheme.BUTTON_LINK);
hLay.addComponent(button);
Label lbl = new Label(" ", ContentMode.HTML);
hLay.addComponent(lbl);
hLay.addComponent(buttonReg);
layout.addComponent(label);
layout.addComponent(hLay);
-
+
+ VerticalLayout box = new VerticalLayout();
HorizontalLayout horSpacer = new HorizontalLayout();
horSpacer.addComponent(layout);
- this.addComponent(horSpacer);
+ box.addComponent(horSpacer);
horSpacer.setComponentAlignment(layout, Alignment.MIDDLE_CENTER);
- this.setComponentAlignment(horSpacer, Alignment.MIDDLE_CENTER);
+ box.setComponentAlignment(horSpacer, Alignment.MIDDLE_CENTER);
+
+ HorizontalLayout abbruchSpacer = new HorizontalLayout();
+ abbruchSpacer.addComponent(abbruch);
+ Label lb = new Label(" ", ContentMode.HTML);
+ box.addComponent(lb);
+ box.addComponent(abbruchSpacer);
+
+ box.setComponentAlignment(abbruchSpacer, Alignment.MIDDLE_CENTER);
+
+ this.addComponent(box);
+ this.setComponentAlignment(box, Alignment.MIDDLE_CENTER);
button.addClickListener((Button.ClickEvent event) -> {
String login = userLogin.getValue();
String password = passwordField.getValue();
@@ -91,6 +107,9 @@ public class LoginView extends TemplateView {
buttonReg.addClickListener((Button.ClickEvent event) -> {
UI.getCurrent().getNavigator().navigateTo(Views.REGISTRIERUNG);
});
+ abbruch.addClickListener(e -> {
+ UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
+ });
}
}
--
GitLab