Merge remote-tracking branch 'server/master'

java/com.sap.sailing.gwt.ui/Simulator.css

@@ -23,6 +23,10 @@
   top: -1000px;
 }
 
+html {
+  font-size: 15px;
+}
+
 .titleLabelWrapper {
   position: relative;
     margin-left: auto;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorEntryPoint.java

@@ -7,16 +7,21 @@ import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 import com.google.gwt.user.client.ui.DockLayoutPanel;
-import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.RootLayoutPanel;
+import com.google.gwt.user.client.ui.Widget;
+import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication;
 import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint;
-import com.sap.sailing.gwt.ui.client.LogoAndTitlePanel;
 import com.sap.sailing.gwt.ui.client.RemoteServiceMappingConstants;
 import com.sap.sailing.gwt.ui.client.SimulatorService;
 import com.sap.sailing.gwt.ui.client.SimulatorServiceAsync;
 import com.sap.sailing.simulator.util.SailingSimulatorConstants;
 import com.sap.sse.gwt.client.EntryPointHelper;
 import com.sap.sse.gwt.resources.Highcharts;
+import com.sap.sse.security.ui.authentication.decorator.AuthorizedContentDecorator;
+import com.sap.sse.security.ui.authentication.decorator.WidgetFactory;
+import com.sap.sse.security.ui.authentication.generic.GenericAuthentication;
+import com.sap.sse.security.ui.authentication.generic.GenericAuthorizedContentDecorator;
+import com.sap.sse.security.ui.authentication.generic.sapheader.SAPHeaderWithAuthentication;
 
 public class SimulatorEntryPoint extends AbstractSailingEntryPoint {
 
@@ -181,41 +186,27 @@ public class SimulatorEntryPoint extends AbstractSailingEntryPoint {
         }
     }
 
-    private FlowPanel createLogoAndTitlePanel(SimulatorMainPanel simulatorPanel) {
-        LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(getStringMessages().strategySimulatorTitle(), null,
-                getStringMessages(), this, getUserService());
-        /*{
-            @Override
-            public void onResize() {
-                super.onResize();
-                if (isSmallWidth()) {
-                    remove(globalNavigationPanel);
-                } else {
-                    add(globalNavigationPanel);
-                }
-            }
-        };*/
-        logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
-
-        return logoAndTitlePanel;
-    }
-
     private void createSimulatorPanel() {
-        SimulatorMainPanel simulatorPanel = new SimulatorMainPanel(simulatorService, getStringMessages(), this, xRes, yRes, border, streamletPars,
-                autoUpdate, mode, event, showGrid, showLines, seedLines, showArrows, showLineGuides, showStreamlets, showMapControls);
-
-        DockLayoutPanel p = new DockLayoutPanel(Unit.PX);
-        RootLayoutPanel.get().add(p);
-
-        // FlowPanel toolbarPanel = new FlowPanel();
-        // toolbarPanel.add(simulatorPanel.getNavigationWidget());
-        // p.addNorth(toolbarPanel, 40);
-
-        FlowPanel logoAndTitlePanel = createLogoAndTitlePanel(simulatorPanel);
-
-        p.addNorth(logoAndTitlePanel, 68);
-        p.add(simulatorPanel);
-        p.addStyleName("dockLayoutPanel");
+        SAPHeaderWithAuthentication header  = new SAPHeaderWithAuthentication(getStringMessages()
+                .sapSailingAnalytics(), getStringMessages().strategySimulatorTitle());
+        
+        GenericAuthentication genericSailingAuthentication = new FixedSailingAuthentication(getUserService(), header.getAuthenticationMenuView());
+        AuthorizedContentDecorator authorizedContentDecorator = new GenericAuthorizedContentDecorator(genericSailingAuthentication);
+        authorizedContentDecorator.setContentWidgetFactory(new WidgetFactory() {
+            @Override
+            public Widget get() {
+                SimulatorMainPanel simulatorPanel = new SimulatorMainPanel(simulatorService, getStringMessages(), SimulatorEntryPoint.this, xRes, yRes, border, streamletPars,
+                        autoUpdate, mode, event, showGrid, showLines, seedLines, showArrows, showLineGuides, showStreamlets, showMapControls);
+                return simulatorPanel;
+            }
+        });
+        
+        RootLayoutPanel rootPanel = RootLayoutPanel.get();
+        DockLayoutPanel panel = new DockLayoutPanel(Unit.PX);
+        panel.addNorth(header, 75);
+        panel.add(authorizedContentDecorator);
+        panel.addStyleName("dockLayoutPanel");
+        rootPanel.add(panel);
     }
-
+    
 }

java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/SailingAnalyticsNotes.html

@@ -4,6 +4,14 @@
 <div id="mainContent">
     <h4 class="articleHeadline">What's New - SAP Sailing Analytics</h4>
     <div class="innerContent">
+        <h5 class="articleSubheadline">August 2016</h5>
+        <ul class="bulletList">
+           <li>In order to prepare user-specific configuration support in the <tt>/gwt/Simulator.html</tt>, this
+               module now requires a user account to be used. Please sign up and log in to use the full-featured
+               simulator as usual.  
+           </li>
+        </ul>
+        
         <h5 class="articleSubheadline">July 2016</h5>
         <ul class="bulletList">
            <li>The Wind arrow in the top left corner of the race map / player now serves as a toggle button

java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml

@@ -32,6 +32,7 @@
 	<inherits name="com.sap.sailing.gwt.ui.SourceLeaderboard"/>
 	<inherits name='com.sap.sailing.gwt.ui.SourceCommon'/>
 	<inherits name='com.sap.sailing.gwt.ui.SourceSimulator'/>
+	<inherits name='com.sap.sailing.gwt.common.AuthenticationCommon'/>
 
 	<inherits name='com.sap.sse.gwt.CommonControlCSS_Autoinject'/>