diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/sailorprofiletab/SailorProfileOverviewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/sailorprofiletab/SailorProfileOverviewImpl.java index cdf270fd7b4..54c7575aae6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/sailorprofiletab/SailorProfileOverviewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/sailorprofiletab/SailorProfileOverviewImpl.java @@ -97,7 +97,8 @@ public class SailorProfileOverviewImpl extends Composite implements SailorProfil removeColumn.setCellStyleNames(DesignedCellTableResources.INSTANCE.cellTableStyle().buttonCell()); removeColumn.setFieldUpdater((int index, SailorProfileDTO dto, String value) -> ConfirmDialogFactory - .showConfirmDialog(StringMessages.INSTANCE.sailorProfileRemoveMessage(), new DialogCallback() { + .showConfirmDialog(StringMessages.INSTANCE.sailorProfileRemoveMessage(), + StringMessages.INSTANCE.confirmDeletion(), new DialogCallback() { @Override public void ok(Void editedObject) { presenter.removeSailorProfile(dto.getKey()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/sailorprofiles/SailorProfileOverviewEntry.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/sailorprofiles/SailorProfileOverviewEntry.java index 2584a926024..a236e03f455 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/sailorprofiles/SailorProfileOverviewEntry.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/user/profile/sailorprofiles/SailorProfileOverviewEntry.java @@ -97,8 +97,7 @@ public class SailorProfileOverviewEntry extends Composite { e.getNativeEvent().preventDefault(); e.getNativeEvent().stopPropagation(); ConfirmDialogFactory.showConfirmDialog(StringMessages.INSTANCE.sailorProfileRemoveMessage(), - new DialogCallback() { - + StringMessages.INSTANCE.confirmDeletion(), new DialogCallback() { @Override public void ok(Void v) { presenter.removeSailorProfile(uuidRef); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogFactory.java index 7adcf5635a1..8117b4f3ee6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogFactory.java @@ -12,10 +12,11 @@ public final class ConfirmDialogFactory { * creates a yes/no {@link ConfirmDialogPanel} with {@link #message}, which calls {@link DialogCallback#ok(Object)} * or {@link DialogCallback#cancel()} */ - public static void showConfirmDialog(String message, final DialogCallback callback) { + public static void showConfirmDialog(final String message, final String title, + final DialogCallback callback) { DialogResources.INSTANCE.css().ensureInjected(); PopupPanel dialog = new PopupPanel(); - ConfirmDialogPanel confirmDialogPanel = new ConfirmDialogPanel(message, callback, dialog); + ConfirmDialogPanel confirmDialogPanel = new ConfirmDialogPanel(message, title, callback, dialog); dialog.setWidget(confirmDialogPanel); confirmDialogPanel.addStyleName(DialogResources.INSTANCE.css().dialog()); dialog.addStyleName(DialogResources.INSTANCE.css().backgroundPanel()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogPanel.java index c7111ae669d..3c87e67a7eb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogPanel.java @@ -32,19 +32,23 @@ public class ConfirmDialogPanel extends Composite { @UiField DivElement messageField; + @UiField + DivElement titleField; + private final DialogCallback callback; private final PopupPanel parent; public ConfirmDialogPanel() { - this("", null, null); + this("", "", null, null); } - public ConfirmDialogPanel(String message, DialogCallback callback, PopupPanel parent) { + public ConfirmDialogPanel(String message, String title, DialogCallback callback, PopupPanel parent) { initWidget(uiBinder.createAndBindUi(this)); this.callback = callback; this.parent = parent; messageField.setInnerText(message); + titleField.setInnerText(title); } @UiHandler("yesButton") diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogPanel.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogPanel.ui.xml index 53806472665..1889cf72145 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogPanel.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/ConfirmDialogPanel.ui.xml @@ -3,6 +3,7 @@ +
Yes diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/Dialog.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/Dialog.gss index 678ceda0e6b..4bd99cc2597 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/Dialog.gss +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/Dialog.gss @@ -5,8 +5,8 @@ background-color: #f2f2f2; padding: 1em; border: 1px solid #ccc; - border-radius: 1em; - width: 50%; + border-radius: 3px; + width: 25%; -webkit-transform: translate(-50%, -50%); -moz-transform: translate(-50%, -50%); -ms-transform: translate(-50%, -50%); @@ -14,8 +14,27 @@ box-shadow: 0.1em 0.1em 1em #bbb; } +@media (max-width: 400px) { + .dialog { + width: 90%; + } +} + +@media (min-width: 400px) { + .dialog { + width: 50%; + } +} + +@media (min-width: 600px) { + .dialog { + width: 40%; + } +} + .message { margin-bottom: .5em; + text-align: center; } .yesButton { @@ -43,7 +62,6 @@ } .button { - font-size: 1.1111em; display: inline; width: 4em; height: 2.5em; @@ -64,4 +82,11 @@ top: 0; left: 0; background-color: rgba(0, 0, 0, .33333333); +} + +.title { + font-size: 1.5em; + color: #555; + font-weight: 600; + margin-bottom: .75em; } \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/DialogResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/DialogResources.java index 896f965f977..a6909bfcbc1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/DialogResources.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/DialogResources.java @@ -26,5 +26,7 @@ public interface DialogResources extends ClientBundle { String buttonPanel(); String backgroundPanel(); + + String title(); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index b3fe29a1d08..711e1533925 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -2192,4 +2192,6 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String noStatisticsFoundForCompetitors(); String sailorProfileRemoveMessage(); String showInDataMining(); + + String confirmDeletion(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index 68884bf521e..2510bb5bd96 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -2187,4 +2187,5 @@ noStatisticsFoundForCompetitors=There are no statistics available for the select pleaseSelectCompetitorFirst=Please select a competitor first. sailorProfileRemoveMessage=Are you sure you want to remove this Sailor Profile? moreLoginInformationSectionSailorProfilesDescription=After logging in, you can now find a new area under your user profile, which is called 'Sailor Profiles'. You can add some competitors to such a Sailor Profile and get more insights about these competitors. In a Sailor Profile, you can see all the events your favorite competitors participated in and compare their placements to each others. Additionally, you get an overview about the most important statistics, like the maximum speed or the average distance to the start line with direct links to the Race Map to see the exact point in time, where for example the fastest competitor reached his record. For aggregative statistics like the average distance to startline at racestart, you can click on the arrow and are forwarded to Data Mining where you can drill down on the average values. -moreLoginInformationSectionSailorProfilesHeading=Sailor Profiles \ No newline at end of file +moreLoginInformationSectionSailorProfilesHeading=Sailor Profiles +confirmDeletion=Confirm Deletion \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 97a1525f321..cb80aa997a7 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -2182,4 +2182,5 @@ noStatisticsFoundForCompetitors=Für die ausgewählten Teams stehen keine Statis pleaseSelectCompetitorFirst=Bitte zunächst ein Team auswählen sailorProfileRemoveMessage=Sicher, dass das Seglerprofil gelöscht werden soll? moreLoginInformationSectionSailorProfilesDescription=Nach dem Login können Sie nun in ihrem Userprofil einen neuen Bereich namens 'Seglerprofile' finden. Dort können Sie ein solches Seglerprofil anlegen, um detailliertere Informationen zum ausgewählten Team zu erhalten. In einem Seglerprofil können Sie alle Events ihrer Lieblingsteams verfolgen und deren Platzierungen direkt miteinander vergleichen. Außerdem erhalten Sie eine Übersicht über die wichtigsten Statistiken, wie die Maximalgeschwindigkeit oder die durchschnittliche Distanz zur Startlinie am Rennstart. Von hier aus gibt es auch direkte Absprungpunkte zu den für die individuelle Statistik relevanten Orten in Sailing Analytics. So können Sie etwa direkt von der Maximalgeschwindigkeit in die Race Map springen, wo dann das Rennen zu dem Zeitpunkt der Maximalgeschwindigkeit startet. Von der durchschnittlichen Distanz zur Startlinie können Sie dagegen gleich ins Data Mining wechseln, wo Sie dann einen Drill Down der Durchschnittswerte sehen. -moreLoginInformationSectionSailorProfilesHeading=Seglerprofile \ No newline at end of file +moreLoginInformationSectionSailorProfilesHeading=Seglerprofile +confirmDeletion=Löschen bestätigen \ No newline at end of file