diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b1fb9885f152fbee1e05de09e16f34b85df1dec0..ab79adb019157c0c4bfec7fe3bf82f6d82c63289 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,9 @@
<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/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/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/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 +31,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="529">
- <caret line="95" column="32" lean-forward="false" selection-start-line="95" selection-start-column="3" selection-end-line="95" selection-end-column="32" />
+ <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" />
<folding />
</state>
</provider>
@@ -61,41 +61,35 @@
<file leaf-file-name="TemplateView.java" pinned="false" current-in-tab="false">
<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="19">
- <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
+ <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" />
<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" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WelcomeView.java" pinned="false" current-in-tab="true">
+ <file leaf-file-name="WelcomeView.java" pinned="false" current-in-tab="false">
<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="396">
- <caret line="36" column="54" lean-forward="false" selection-start-line="36" selection-start-column="54" selection-end-line="36" selection-end-column="54" />
+ <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>
</file>
- <file leaf-file-name="RegistrierungView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/RegistrierungView.java">
+ <file leaf-file-name="ContactView.java" pinned="false" current-in-tab="true">
+ <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="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" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="WarenkorbView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WarenkorbView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="27" column="21" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
- <folding />
+ <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" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -161,7 +155,6 @@
<option value="$PROJECT_DIR$/src/main/resources/org/s4s/gui/views/WelcomeViewDesign.html" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ImpressumView.java" />
- <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ContactView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LogoutControl.java" />
@@ -169,14 +162,15 @@
<option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css" />
<option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.scss" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java" />
- <option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss" />
<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/WelcomeView.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" />
<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" />
</list>
</option>
</component>
@@ -467,10 +461,6 @@
<option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="dto" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -498,7 +488,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gui" />
+ <option name="myItemId" value="dto" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -531,10 +521,6 @@
<option name="myItemId" value="gui" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="views" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -561,6 +547,14 @@
<option name="myItemId" value="s4s" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="gui" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="views" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
@@ -1089,7 +1083,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="43464000" />
+ <option name="totallyTimeSpent" value="44353000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1362,13 +1356,6 @@
</state>
</provider>
</entry>
- <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="154">
- <caret line="7" column="45" lean-forward="false" selection-start-line="7" selection-start-column="45" selection-end-line="7" selection-end-column="45" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java" />
<entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8-sources.jar!/com/vaadin/ui/Button.java" />
<entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8-sources.jar!/com/vaadin/ui/themes/BaseTheme.java" />
@@ -1440,14 +1427,6 @@
</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="529">
- <caret line="95" column="32" lean-forward="false" selection-start-line="95" selection-start-column="3" selection-end-line="95" selection-end-column="32" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/README">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1495,16 +1474,6 @@
</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="19">
- <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<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">
@@ -1533,11 +1502,41 @@
</entry>
<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="396">
- <caret line="36" column="54" lean-forward="false" selection-start-line="36" selection-start-column="54" selection-end-line="36" selection-end-column="54" />
+ <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/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" />
+ <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="62" column="80" lean-forward="true" selection-start-line="62" selection-start-column="80" selection-end-line="62" selection-end-column="80" />
+ <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" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <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" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/src/main/java/org/s4s/gui/views/ContactView.java b/src/main/java/org/s4s/gui/views/ContactView.java
index 4cc167a505df7e22be53834fac945c55da9ce77a..aa9afc000ef72b2241ff52b81bba48ebdc9c9566 100644
--- a/src/main/java/org/s4s/gui/views/ContactView.java
+++ b/src/main/java/org/s4s/gui/views/ContactView.java
@@ -36,11 +36,11 @@ public class ContactView extends TemplateView{
Panel pKontakt = new Panel("Kontakt Anfrage");
// pKontakt.addStyleName("kontakt");
- this.addComponent(pKontakt);
- this.setComponentAlignment(pKontakt, Alignment.MIDDLE_CENTER);
+ //this.addComponent(pKontakt);
+ //this.setComponentAlignment(pKontakt, Alignment.MIDDLE_CENTER);
pKontakt.setContent(vLayout);
- super.setUpFooterAndHeader(vLayout);
+ super.setUpFooterAndHeader(pKontakt);
}
}
diff --git a/src/main/java/org/s4s/gui/views/TemplateView.java b/src/main/java/org/s4s/gui/views/TemplateView.java
index 047c6ca614a740d33112681ae52aad5605c883b4..c967e0b31b9162273ec086607ada0f2c8cb91624 100644
--- a/src/main/java/org/s4s/gui/views/TemplateView.java
+++ b/src/main/java/org/s4s/gui/views/TemplateView.java
@@ -53,12 +53,10 @@ public class TemplateView extends VerticalLayout implements View {
HorizontalLayout navigationPanelGrid = buildNavigationHeader();
HorizontalLayout footerLayout = buildFooter();
- HorizontalLayout contenLayout = new HorizontalLayout();
- contenLayout.addComponent(content);
- contenLayout.setComponentAlignment(content,Alignment.MIDDLE_CENTER);
- contenLayout.setWidth(100f, Unit.PERCENTAGE);
+ content.addStyleName("MainContenLocation");
+
//Final Content warpping Header and Footer around Content #mkomp2s
- final VerticalLayout mainLayout = new VerticalLayout(headerLayout,navigationPanelGrid, contenLayout, footerLayout);
+ final VerticalLayout mainLayout = new VerticalLayout(headerLayout,navigationPanelGrid, content, footerLayout);
mainLayout.setSizeFull();
///mainLayout.setExpandRatio(content, 1);
mainLayout.setSpacing(true);;
diff --git a/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss b/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
index 015a9d2dd2dd479213f77e3db7550a0b7b14a267..fa5664da5e268b65724e37947787b6ca6aabb4e7 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
+++ b/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
@@ -41,7 +41,9 @@
z-index: -1;
}
-
+ .MainContenLocation{
+ padding-top:70px;
+ }
.customfooter {
position:fixed;
diff --git a/src/main/webapp/VAADIN/themes/mytheme/styles.css b/src/main/webapp/VAADIN/themes/mytheme/styles.css
index 1cee1e5eb4ca7a297e3679b4cf4dbe11c412657e..72ec58e23ee08f7970a124df621f0078116d486f 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/styles.css
+++ b/src/main/webapp/VAADIN/themes/mytheme/styles.css
@@ -12991,6 +12991,10 @@ div.v-layout.v-horizontal.v-widget {
z-index: -1;
}
+.mytheme .MainContenLocation {
+ padding-top: 70px;
+}
+
.mytheme .customfooter {
position: fixed;
left: 0px;