diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ab79adb019157c0c4bfec7fe3bf82f6d82c63289..e1b134e5b4751f4822fee7fdbe92599b6df0baf6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,11 @@
<component name="ChangeListManager">
<list default="true" id="5f36371d-de5c-44ce-a12c-613727d95355" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopErstellung.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopErstellung.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShoperstellungsBestätigung.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShoperstellungsBestätigung.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss" afterPath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css" afterPath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css" />
</list>
<ignored path="shopInShop.iws" />
@@ -31,8 +33,8 @@
<file leaf-file-name="mytheme.scss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="220">
- <caret line="43" column="21" lean-forward="false" selection-start-line="43" selection-start-column="3" selection-end-line="43" selection-end-column="21" />
+ <state relative-caret-position="352">
+ <caret line="49" column="13" lean-forward="true" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
<folding />
</state>
</provider>
@@ -41,31 +43,41 @@
<file leaf-file-name="Views.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="28" column="57" lean-forward="false" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="57" />
+ <state relative-caret-position="348">
+ <caret line="28" column="87" lean-forward="false" selection-start-line="28" selection-start-column="61" selection-end-line="28" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="styles.scss" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.scss">
+ <file leaf-file-name="ShopErstellung.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopErstellung.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="44">
- <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+ <state relative-caret-position="414">
+ <caret line="100" column="41" lean-forward="false" selection-start-line="100" selection-start-column="41" selection-end-line="100" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="TemplateView.java" pinned="false" current-in-tab="false">
+ <file leaf-file-name="ShoperstellungsBestätigung.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShoperstellungsBestätigung.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="436">
+ <caret line="47" column="9" lean-forward="false" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="TemplateView.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
- <caret line="62" column="80" lean-forward="true" selection-start-line="62" selection-start-column="80" selection-end-line="62" selection-end-column="80" />
+ <caret line="21" column="46" lean-forward="true" selection-start-line="21" selection-start-column="46" selection-end-line="21" selection-end-column="46" />
<folding>
<element signature="imports" expanded="true" />
- <element signature="method#buildNavigationHeader#0;class#TemplateView#0" expanded="false" />
+ <element signature="class#2596:4043" expanded="false" />
<element signature="method#buildFooter#0;class#TemplateView#0" expanded="false" />
</folding>
</state>
@@ -82,11 +94,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="ContactView.java" pinned="false" current-in-tab="true">
+ <file leaf-file-name="ContactView.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="500">
- <caret line="43" column="43" lean-forward="false" selection-start-line="43" selection-start-column="43" selection-end-line="43" selection-end-column="43" />
+ <state relative-caret-position="258">
+ <caret line="32" column="54" lean-forward="false" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -97,8 +109,8 @@
<file leaf-file-name="InitView.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="264">
- <caret line="45" column="81" lean-forward="false" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="81" />
+ <state relative-caret-position="462">
+ <caret line="48" column="40" lean-forward="true" selection-start-line="48" selection-start-column="40" selection-end-line="48" selection-end-column="40" />
<folding />
</state>
</provider>
@@ -165,12 +177,14 @@
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/LoginView.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/AppWidgetset.gwt.xml" />
- <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java" />
- <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" />
<option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss" />
- <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopErstellung.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShoperstellungsBestätigung.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java" />
</list>
</option>
</component>
@@ -1083,7 +1097,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="44353000" />
+ <option name="totallyTimeSpent" value="46500000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1099,12 +1113,12 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23891892" sideWeight="0.27291667" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1745435" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24665178" sideWeight="0.49583334" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24665178" sideWeight="0.49583334" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22126746" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1858217" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1176,20 +1190,6 @@
<option name="serverPort" value="52118" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3652">
- <caret line="166" column="32" lean-forward="false" selection-start-line="166" selection-start-column="32" selection-end-line="166" selection-end-column="32" />
- <folding>
- <element signature="n#prerequisites#0;n#project#0;n#!!top" expanded="false" />
- <element signature="n#properties#0;n#project#0;n#!!top" expanded="false" />
- <element signature="n#build#0;n#project#0;n#!!top" expanded="false" />
- <element signature="n#profiles#0;n#project#0;n#!!top" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java" />
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
@@ -1393,7 +1393,7 @@
<state relative-caret-position="242">
<caret line="15" column="19" lean-forward="false" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
<folding>
- <element signature="imports" expanded="true" />
+ <element signature="imports" expanded="false" />
</folding>
</state>
</provider>
@@ -1466,74 +1466,91 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1188">
- <caret line="83" column="19" lean-forward="false" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="19" />
+ <state relative-caret-position="176">
+ <caret line="32" column="73" lean-forward="false" selection-start-line="32" selection-start-column="73" selection-end-line="32" selection-end-column="73" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="28" column="57" lean-forward="false" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="57" />
- <folding />
+ <state relative-caret-position="258">
+ <caret line="32" column="54" lean-forward="false" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="264">
- <caret line="45" column="81" lean-forward="false" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="81" />
+ <state relative-caret-position="462">
+ <caret line="48" column="40" lean-forward="true" selection-start-line="48" selection-start-column="40" selection-end-line="48" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopErstellung.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="248">
- <caret line="15" column="38" lean-forward="true" selection-start-line="15" selection-start-column="38" selection-end-line="15" selection-end-column="38" />
- <folding>
- <element signature="e#0#1522#0" expanded="true" />
- </folding>
+ <state relative-caret-position="414">
+ <caret line="100" column="41" lean-forward="false" selection-start-line="100" selection-start-column="41" selection-end-line="100" selection-end-column="41" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShoperstellungsBestätigung.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="176">
- <caret line="32" column="73" lean-forward="false" selection-start-line="32" selection-start-column="73" selection-end-line="32" selection-end-column="73" />
+ <state relative-caret-position="436">
+ <caret line="47" column="9" lean-forward="false" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="418">
+ <caret line="117" column="11" lean-forward="true" selection-start-line="117" selection-start-column="11" selection-end-line="117" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="220">
- <caret line="43" column="21" lean-forward="false" selection-start-line="43" selection-start-column="3" selection-end-line="43" selection-end-column="21" />
+ <state relative-caret-position="352">
+ <caret line="49" column="13" lean-forward="true" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="418">
- <caret line="62" column="80" lean-forward="true" selection-start-line="62" selection-start-column="80" selection-end-line="62" selection-end-column="80" />
+ <state relative-caret-position="458">
+ <caret line="48" column="39" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
<folding>
- <element signature="imports" expanded="true" />
- <element signature="method#buildNavigationHeader#0;class#TemplateView#0" expanded="false" />
- <element signature="method#buildFooter#0;class#TemplateView#0" expanded="false" />
+ <element signature="e#0#1524#0" expanded="false" />
+ <element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="500">
- <caret line="43" column="43" lean-forward="false" selection-start-line="43" selection-start-column="43" selection-end-line="43" selection-end-column="43" />
+ <state relative-caret-position="348">
+ <caret line="28" column="87" lean-forward="false" selection-start-line="28" selection-start-column="61" selection-end-line="28" selection-end-column="87" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="418">
+ <caret line="21" column="46" lean-forward="true" selection-start-line="21" selection-start-column="46" selection-end-line="21" selection-end-column="46" />
<folding>
<element signature="imports" expanded="true" />
+ <element signature="class#2596:4043" expanded="false" />
+ <element signature="method#buildFooter#0;class#TemplateView#0" expanded="false" />
</folding>
</state>
</provider>
diff --git a/src/main/java/org/s4s/gui/views/RegistrierungView.java b/src/main/java/org/s4s/gui/views/RegistrierungView.java
index dbf1d4e1d31f5e7dedf0ac6bae8d7b10627bc356..8379d82414483750239bed9309050d2c2fd4e61e 100644
--- a/src/main/java/org/s4s/gui/views/RegistrierungView.java
+++ b/src/main/java/org/s4s/gui/views/RegistrierungView.java
@@ -40,8 +40,8 @@ public class RegistrierungView extends TemplateView implements View {
private void setUp() {
- //Panel panel = new Panel("Registrierung");
- //panel.setSizeUndefined();
+ Panel panel = new Panel("Registrierung");
+ panel.setSizeUndefined();
FormLayout content = new FormLayout();
@@ -83,7 +83,7 @@ public class RegistrierungView extends TemplateView implements View {
// content.setSizeUndefined();
content.setMargin(true);
- //panel.setContent(content);
+ panel.setContent(content);
//this.addComponent(panel);
//this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);
@@ -117,6 +117,6 @@ public class RegistrierungView extends TemplateView implements View {
UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
});
- super.setUpFooterAndHeader(content);
+ super.setUpFooterAndHeader(panel);
}
}
diff --git a/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java b/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java
index 2a252a79c6f60c7e414f861df1934e476b977dd0..e1603ad43c770aecb458384e84cc2542a978ac56 100644
--- a/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java
+++ b/src/main/java/org/s4s/gui/views/RegistrierungsBestaetigung.java
@@ -45,8 +45,8 @@ public class RegistrierungsBestaetigung extends TemplateView implements View {
content.setMargin(true);
panel.setContent(content);
- this.addComponent(panel);
- this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);
+ //this.addComponent(panel);
+ //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);
- super.setUpFooterAndHeader(content);
+ super.setUpFooterAndHeader(panel);
}}
diff --git a/src/main/java/org/s4s/gui/views/ShopErstellung.java b/src/main/java/org/s4s/gui/views/ShopErstellung.java
index 2b8f20a6e05bfd1c198831ad27eebd910a1d0eb8..5b9f1e3c5ad6330f02dbe66b49491fbbab02901a 100644
--- a/src/main/java/org/s4s/gui/views/ShopErstellung.java
+++ b/src/main/java/org/s4s/gui/views/ShopErstellung.java
@@ -70,8 +70,8 @@ public class ShopErstellung extends TemplateView implements View {
content.setMargin(true);
panel.setContent(content);
- this.addComponent(panel);
- this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);
+ //this.addComponent(panel);
+ //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);
@@ -98,6 +98,6 @@ public class ShopErstellung extends TemplateView implements View {
UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
});
- super.setUpFooterAndHeader(content);
+ super.setUpFooterAndHeader(panel);
}
}
diff --git "a/src/main/java/org/s4s/gui/views/ShoperstellungsBest\303\244tigung.java" "b/src/main/java/org/s4s/gui/views/ShoperstellungsBest\303\244tigung.java"
index 0567e56fdfc6d867aca29c2534105ca2be3039f9..e401933486c3703c39fe3c689f1e7a8e0064a78d 100644
--- "a/src/main/java/org/s4s/gui/views/ShoperstellungsBest\303\244tigung.java"
+++ "b/src/main/java/org/s4s/gui/views/ShoperstellungsBest\303\244tigung.java"
@@ -44,9 +44,9 @@ public class ShoperstellungsBestätigung extends TemplateView implements View {
content.setMargin(true);
panel.setContent(content);
- this.addComponent(panel);
- this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);
+ //this.addComponent(panel);
+ //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);
- super.setUpFooterAndHeader(content);
+ super.setUpFooterAndHeader(panel);
}
}
diff --git a/src/main/java/org/s4s/gui/views/TemplateView.java b/src/main/java/org/s4s/gui/views/TemplateView.java
index c967e0b31b9162273ec086607ada0f2c8cb91624..c1c5a659a4a0188049f84455eab0c56f32a1c3e8 100644
--- a/src/main/java/org/s4s/gui/views/TemplateView.java
+++ b/src/main/java/org/s4s/gui/views/TemplateView.java
@@ -69,7 +69,6 @@ public class TemplateView extends VerticalLayout implements View {
//setComponentAlignment(navigationPanelGrid,Alignment.MIDDLE_CENTER);
setComponentAlignment(mainLayout,Alignment.MIDDLE_CENTER);
-
this.setSpacing(true);
this.setHeightUndefined();
this.setWidthUndefined();