diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5a569e8fd9e6a58738ad05215a152e5348b06945..ae7bfcd315aaa9515ae24a2e9fdbad495f65b922 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,13 @@
<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$/shopInShop.iml" afterPath="$PROJECT_DIR$/shopInShop.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LogoutControl.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LogoutControl.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.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$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" />
+ <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" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.scss" afterPath="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.scss" />
</list>
<ignored path="shopInShop.iws" />
<ignored path=".idea/workspace.xml" />
@@ -26,98 +31,90 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
- <file leaf-file-name="InitView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java">
+ <file leaf-file-name="LogoutControl.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LogoutControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="204">
- <caret line="34" column="40" lean-forward="false" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
+ <state relative-caret-position="286">
+ <caret line="13" column="41" lean-forward="true" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
<folding>
- <element signature="imports" expanded="true" />
- <marker date="1494998872360" expanded="true" signature="2026:2032" ph="{...}" />
- <marker date="1494998872360" expanded="true" signature="2042:2195" ph="@{...}" />
- <marker date="1494998872360" expanded="true" signature="2254:2261" ph="{...}" />
+ <element signature="e#0#695#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="LoginControl.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="340">
- <caret line="24" column="4" lean-forward="false" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" />
+ <state relative-caret-position="550">
+ <caret line="29" column="17" lean-forward="false" selection-start-line="29" selection-start-column="16" selection-end-line="29" selection-end-column="17" />
<folding>
- <marker date="1494998872376" expanded="true" signature="1031:1047" ph="{}" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="FaqView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/FaqView.java">
+ <file leaf-file-name="mytheme.scss" pinned="false" current-in-tab="true">
+ <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="238">
- <caret line="20" column="5" lean-forward="false" selection-start-line="17" selection-start-column="3" selection-end-line="20" selection-end-column="5" />
- <folding>
- <marker date="1494998872365" expanded="true" signature="484:627" ph="{...}" />
- </folding>
+ <state relative-caret-position="358">
+ <caret line="69" column="18" lean-forward="false" selection-start-line="69" selection-start-column="18" selection-end-line="69" selection-end-column="18" />
+ <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">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-340">
- <caret line="85" column="68" lean-forward="false" selection-start-line="85" selection-start-column="68" selection-end-line="85" selection-end-column="68" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <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" />
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ShopView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java">
+ <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="170">
- <caret line="48" column="65" lean-forward="true" selection-start-line="47" selection-start-column="6" selection-end-line="48" selection-end-column="65" />
- <folding />
+ <state relative-caret-position="310">
+ <caret line="182" column="47" lean-forward="false" selection-start-line="182" selection-start-column="47" selection-end-line="182" selection-end-column="47" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="PasswortView.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/PasswortView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="339">
- <caret line="38" column="21" lean-forward="true" selection-start-line="38" selection-start-column="21" selection-end-line="38" selection-end-column="21" />
- <folding />
+ <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" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <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">
+ <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="459">
- <caret line="39" column="8" lean-forward="false" selection-start-line="39" selection-start-column="8" selection-end-line="39" selection-end-column="8" />
- <folding>
- <element signature="imports" expanded="true" />
- <marker date="1494998872373" expanded="true" signature="2619:2625" ph="{...}" />
- </folding>
+ <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>
</provider>
</entry>
</file>
- <file leaf-file-name="ImpressumView.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ImpressumView.java">
+ <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="323">
- <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
- <folding>
- <marker date="1494998872365" expanded="true" signature="1641:1647" ph="{...}" />
- </folding>
+ <state relative-caret-position="462">
+ <caret line="48" column="0" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
@@ -171,14 +168,18 @@
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/BenutzerkontoView.java" />
<option value="$PROJECT_DIR$/src/main/resources/org/s4s/gui/views/WelcomeViewDesign.html" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" />
- <option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css" />
- <option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss" />
<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" />
+ <option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/addons.scss" />
+ <option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java" />
+ <option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.scss" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java" />
+ <option value="$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss" />
</list>
</option>
</component>
@@ -199,10 +200,10 @@
<treeState />
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="-6" />
- <option name="y" value="-6" />
- <option name="width" value="1613" />
- <option name="height" value="873" />
+ <option name="x" value="-8" />
+ <option name="y" value="-8" />
+ <option name="width" value="1936" />
+ <option name="height" value="1056" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -221,102 +222,489 @@
<panes>
<pane id="ProjectPane">
<subPane>
- <expand>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="views" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="resources" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="webapp" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="webapp" type="462c0819:PsiDirectoryNode" />
- <item name="META-INF" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="webapp" type="462c0819:PsiDirectoryNode" />
- <item name="VAADIN" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="webapp" type="462c0819:PsiDirectoryNode" />
- <item name="VAADIN" type="462c0819:PsiDirectoryNode" />
- <item name="themes" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="shopInShop" type="b2602c69:ProjectViewProjectNode" />
- <item name="s4s" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="webapp" type="462c0819:PsiDirectoryNode" />
- <item name="VAADIN" type="462c0819:PsiDirectoryNode" />
- <item name="themes" type="462c0819:PsiDirectoryNode" />
- <item name="mytheme" type="462c0819:PsiDirectoryNode" />
- </path>
- </expand>
- <select />
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="target" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="target" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="classes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="target" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="classes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="webapp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="WEB-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="images" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="webapp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="VAADIN" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="themes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mytheme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="styles.scss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NestingTreeNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="webapp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="VAADIN" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="themes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mytheme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="webapp" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="services" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <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>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <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>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <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>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="exceptions" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="dao" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="java" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="dao" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="impl" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="shopInShop" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="s4s" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Dokumentation" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</pane>
+ <pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
- <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -341,103 +729,36 @@
</option>
</component>
<component name="RunManager" selected="Maven.shopInShop [jetty:run]">
- <configuration default="true" type="Applet" factoryName="Applet">
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <module />
- </configuration>
- <configuration default="true" type="Application" factoryName="Application">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
- </configuration>
- <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
- <setting name="vmparams" value="" />
- <setting name="cmdLine" value="run-app" />
- <setting name="passParentEnv" value="true" />
- <setting name="launchBrowser" value="true" />
- <setting name="launchBrowserUrl" value="" />
- <setting name="depsClasspath" value="false" />
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- </configuration>
- <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
- <node-interpreter>project</node-interpreter>
- <node-options />
- <gulpfile />
- <tasks />
- <arguments />
- <envs />
- </configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <envs />
- <patterns />
+ <configuration default="false" name="shopInShop [jetty:run]" type="MavenRunConfiguration" factoryName="Maven" temporary="true">
+ <MavenSettings>
+ <option name="myGeneralSettings" />
+ <option name="myRunnerSettings" />
+ <option name="myRunnerParameters">
+ <MavenRunnerParameters>
+ <option name="profiles">
+ <set />
+ </option>
+ <option name="goals">
+ <list>
+ <option value="jetty:run" />
+ </list>
+ </option>
+ <option name="profilesMap">
+ <map />
+ </option>
+ <option name="resolveToWorkspace" value="false" />
+ <option name="workingDirPath" value="$PROJECT_DIR$" />
+ </MavenRunnerParameters>
+ </option>
+ </MavenSettings>
+ <method />
</configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
<option name="PROGRAM_PARAMETERS" />
<predefined_log_file id="idea.log" enabled="true" />
- </configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration default="true" type="TestNG" factoryName="TestNG">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <envs />
- <properties />
- <listeners />
+ <method />
</configuration>
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="" />
@@ -467,30 +788,6 @@
<option name="ACTIVITY_CLASS" value="" />
<method />
</configuration>
- <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
- <module name="" />
- <option name="DEPLOY" value="true" />
- <option name="ARTIFACT_NAME" value="" />
- <option name="PM_INSTALL_OPTIONS" value="" />
- <option name="ACTIVITY_EXTRA_FLAGS" value="" />
- <option name="MODE" value="default_activity" />
- <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
- <option name="PREFERRED_AVD" value="" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
- <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
- <option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="DEBUGGER_TYPE" value="Java" />
- <option name="USE_LAST_SELECTED_DEVICE" value="false" />
- <option name="PREFERRED_AVD" value="" />
- <Java />
- <Profilers>
- <option name="GAPID_DISABLE_PCS" value="false" />
- </Profilers>
- <option name="DEEP_LINK" value="" />
- <option name="ACTIVITY_CLASS" value="" />
- <method />
- </configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
<module name="" />
<option name="TESTING_TYPE" value="0" />
@@ -518,6 +815,29 @@
</Profilers>
<method />
</configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <module />
+ <method />
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="" />
+ <envs />
+ <method />
+ </configuration>
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
@@ -664,6 +984,37 @@
</ExternalSystemSettings>
<method />
</configuration>
+ <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
+ <setting name="vmparams" value="" />
+ <setting name="cmdLine" value="run-app" />
+ <setting name="passParentEnv" value="true" />
+ <setting name="launchBrowser" value="true" />
+ <setting name="launchBrowserUrl" value="" />
+ <setting name="depsClasspath" value="false" />
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <method />
+ </configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <envs />
+ <patterns />
+ <method />
+ </configuration>
<configuration default="true" type="JarApplication" factoryName="JAR Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<envs />
@@ -748,12 +1099,57 @@
</MavenSettings>
<method />
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ <method />
+ </configuration>
<configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<envs />
<method />
</configuration>
+ <configuration default="true" type="TestNG" factoryName="TestNG">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
+ <option name="PROPERTIES_FILE" />
+ <envs />
+ <properties />
+ <listeners />
+ <method />
+ </configuration>
+ <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+ <node-interpreter>project</node-interpreter>
+ <node-options />
+ <gulpfile />
+ <tasks />
+ <arguments />
+ <envs />
+ <method />
+ </configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
<command value="run" />
<scripts />
@@ -767,34 +1163,38 @@
<configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
<method />
</configuration>
- <configuration name="shopInShop [jetty:run]" type="MavenRunConfiguration" factoryName="Maven" temporary="true">
- <MavenSettings>
- <option name="myGeneralSettings" />
- <option name="myRunnerSettings" />
- <option name="myRunnerParameters">
- <MavenRunnerParameters>
- <option name="profiles">
- <set />
- </option>
- <option name="goals">
- <list>
- <option value="jetty:run" />
- </list>
- </option>
- <option name="profilesMap">
- <map />
- </option>
- <option name="resolveToWorkspace" value="false" />
- <option name="workingDirPath" value="$PROJECT_DIR$" />
- </MavenRunnerParameters>
- </option>
- </MavenSettings>
- </configuration>
+ <list size="1">
+ <item index="0" class="java.lang.String" itemvalue="Maven.shopInShop [jetty:run]" />
+ </list>
<recent_temporary>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="Maven.shopInShop [jetty:run]" />
</list>
</recent_temporary>
+ <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
+ <module name="" />
+ <option name="DEPLOY" value="true" />
+ <option name="ARTIFACT_NAME" value="" />
+ <option name="PM_INSTALL_OPTIONS" value="" />
+ <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+ <option name="MODE" value="default_activity" />
+ <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+ <option name="PREFERRED_AVD" value="" />
+ <option name="CLEAR_LOGCAT" value="false" />
+ <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
+ <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
+ <option name="FORCE_STOP_RUNNING_APP" value="true" />
+ <option name="DEBUGGER_TYPE" value="Java" />
+ <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+ <option name="PREFERRED_AVD" value="" />
+ <Java />
+ <Profilers>
+ <option name="GAPID_DISABLE_PCS" value="false" />
+ </Profilers>
+ <option name="DEEP_LINK" value="" />
+ <option name="ACTIVITY_CLASS" value="" />
+ <method />
+ </configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
@@ -817,19 +1217,20 @@
<workItem from="1494936644066" duration="1526000" />
<workItem from="1494938334998" duration="7373000" />
<workItem from="1494998957951" duration="3852000" />
+ <workItem from="1495525728427" duration="11636000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="23619000" />
+ <option name="totallyTimeSpent" value="35255000" />
</component>
<component name="ToolWindowManager">
- <frame x="-6" y="-6" width="1613" height="873" extended-state="6" />
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
- <window_info id="PlantUML" 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="Palette" 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="TODO" 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="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Nl-Palette" 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="false" content_ui="tabs" />
<window_info id="Palette	" 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="Image Layers" 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="false" content_ui="tabs" />
<window_info id="Java Enterprise" 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="8" side_tool="false" content_ui="tabs" />
@@ -837,11 +1238,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.175" 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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3394256" 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="false" show_stripe_button="true" weight="0.22486487" 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.21450907" 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.21458334" 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" />
@@ -849,12 +1251,11 @@
<window_info id="UI Designer" 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="Theme Preview" 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="Favorites" 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="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.47911227" sideWeight="0.7270833" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.43027028" sideWeight="0.7270833" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="PlantUML" 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="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Nl-Palette" 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="false" content_ui="tabs" />
<window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" 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="com.vaadin.designer.intellij.palette.toolWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296875" sideWeight="0.35135135" order="6" side_tool="false" content_ui="tabs" />
<window_info id="com.vaadin.designer.intellij.outline.toolWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296875" sideWeight="0.6486486" order="6" side_tool="true" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -900,15 +1301,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <breakpoints>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/TemplateView.java</url>
- <line>52</line>
- <properties />
- <option name="timeStamp" value="7" />
- </line-breakpoint>
- </breakpoints>
- <option name="time" value="8" />
+ <option name="time" value="10" />
</breakpoint-manager>
<watches-manager />
</component>
@@ -922,22 +1315,6 @@
<option name="serverPort" value="52118" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/resources/README">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="7968">
- <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 />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8-sources.jar!/com/vaadin/ui/UI.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/Controller/MyUI.java" />
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
@@ -961,12 +1338,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="27" column="24" lean-forward="false" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
- <folding>
- <element signature="imports" expanded="true" />
- <marker date="1494998872360" expanded="true" signature="2026:2032" ph="{...}" />
- <marker date="1494998872360" expanded="true" signature="2042:2195" ph="@{...}" />
- <marker date="1494998872360" expanded="true" signature="2254:2261" ph="{...}" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -1007,13 +1379,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="484">
- <caret line="27" column="28" lean-forward="false" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705">
@@ -1042,20 +1407,6 @@
</state>
</provider>
</entry>
- <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="198">
- <caret line="15" column="47" lean-forward="false" selection-start-line="15" selection-start-column="47" selection-end-line="15" selection-end-column="47" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/PasswortView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="15" column="46" lean-forward="false" selection-start-line="15" selection-start-column="46" selection-end-line="15" selection-end-column="46" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
@@ -1113,13 +1464,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/addons.scss">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/ui/AbstractOrderedLayout.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
@@ -1146,7 +1490,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
@@ -1158,20 +1501,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="146">
- <caret line="1081" column="15" lean-forward="false" selection-start-line="1081" selection-start-column="7" selection-end-line="1081" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.scss">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
@@ -1195,32 +1524,27 @@
</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="459">
- <caret line="39" column="8" lean-forward="false" selection-start-line="39" selection-start-column="8" selection-end-line="39" selection-end-column="8" />
+ <state relative-caret-position="660">
+ <caret line="38" column="8" lean-forward="false" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="8" />
<folding>
- <element signature="imports" expanded="true" />
- <marker date="1494998872373" expanded="true" signature="2619:2625" ph="{...}" />
+ <element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ImpressumView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="323">
+ <state relative-caret-position="374">
<caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
- <folding>
- <marker date="1494998872365" expanded="true" signature="1641:1647" ph="{...}" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/FaqView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
+ <state relative-caret-position="308">
<caret line="20" column="5" lean-forward="false" selection-start-line="17" selection-start-column="3" selection-end-line="20" selection-end-column="5" />
- <folding>
- <marker date="1494998872365" expanded="true" signature="484:627" ph="{...}" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -1233,24 +1557,17 @@
</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="340">
- <caret line="24" column="4" lean-forward="false" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" />
- <folding>
- <marker date="1494998872376" expanded="true" signature="1031:1047" ph="{}" />
- </folding>
+ <state relative-caret-position="462">
+ <caret line="25" column="4" lean-forward="false" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="4" />
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/View/InitView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="204">
+ <state relative-caret-position="462">
<caret line="34" column="40" lean-forward="false" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
- <folding>
- <element signature="imports" expanded="true" />
- <marker date="1494998872360" expanded="true" signature="2026:2032" ph="{...}" />
- <marker date="1494998872360" expanded="true" signature="2042:2195" ph="@{...}" />
- <marker date="1494998872360" expanded="true" signature="2254:2261" ph="{...}" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -1258,51 +1575,114 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <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" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="902">
+ <caret line="46" column="64" lean-forward="false" selection-start-line="46" selection-start-column="64" selection-end-line="46" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LogoutControl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="286">
+ <caret line="13" column="41" lean-forward="true" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
+ <folding>
+ <element signature="e#0#695#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="550">
+ <caret line="29" column="17" lean-forward="false" selection-start-line="29" selection-start-column="16" selection-end-line="29" selection-end-column="17" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <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>
+ </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="462">
+ <caret line="48" column="0" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/PasswortView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <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" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="339">
- <caret line="38" column="21" lean-forward="true" selection-start-line="38" selection-start-column="21" selection-end-line="38" selection-end-column="21" />
+ <state relative-caret-position="242">
+ <caret line="1952" column="0" lean-forward="false" selection-start-line="1952" selection-start-column="0" selection-end-line="1962" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
- <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="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/addons.scss">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="670">
- <caret line="80" column="11" lean-forward="false" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="11" />
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <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">
+ <entry file="file://$PROJECT_DIR$/src/main/webapp/VAADIN/themes/mytheme/styles.scss">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="296">
- <caret line="44" column="42" lean-forward="false" selection-start-line="44" selection-start-column="31" selection-end-line="44" selection-end-column="42" />
+ <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" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopView.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/com/vaadin/vaadin-server/7.7.8/vaadin-server-7.7.8.jar!/com/vaadin/server/communication/UIInitHandler.class">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="48" column="65" lean-forward="true" selection-start-line="47" selection-start-column="6" selection-end-line="48" selection-end-column="65" />
+ <state relative-caret-position="-253">
+ <caret line="145" column="0" lean-forward="false" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
<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="-340">
- <caret line="85" column="68" lean-forward="false" selection-start-line="85" selection-start-column="68" selection-end-line="85" selection-end-column="68" />
+ <state relative-caret-position="310">
+ <caret line="182" column="47" lean-forward="false" selection-start-line="182" selection-start-column="47" selection-end-line="182" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</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="358">
+ <caret line="69" column="18" lean-forward="false" selection-start-line="69" selection-start-column="18" selection-end-line="69" selection-end-column="18" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/shopInShop.iml b/shopInShop.iml
index 09c38a8d8bc2be117caa1611686a4c3f55cdc861..2958c3453c174ffa86cccf7f0c3b060956b8a035 100644
--- a/shopInShop.iml
+++ b/shopInShop.iml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="CompassSettings">
+ <option name="compassSupportEnabled" value="true" />
+ </component>
<component name="FacetManager">
<facet type="gwt" name="GWT">
<configuration>
diff --git a/src/main/java/org/s4s/dao/impl/LogoutControl.java b/src/main/java/org/s4s/dao/impl/LogoutControl.java
index 6e2135bccce791f876e71ff6a93a85ae0d6a7ec6..cddb7b781a1712ba1ec9516cba8954b8501f4990 100644
--- a/src/main/java/org/s4s/dao/impl/LogoutControl.java
+++ b/src/main/java/org/s4s/dao/impl/LogoutControl.java
@@ -12,13 +12,14 @@ package org.s4s.dao.impl;
public class LogoutControl {
private void logout() {
// Close the VaadinServiceSession
- getUI().getSession().close();
+
+ // getUI().getSession().close();
// Invalidate underlying session instead if login info is stored there
// VaadinService.getCurrentRequest().getWrappedSession().invalidate();
// Redirect to avoid keeping the removed UI open in the browser
- getUI().getPage().setLocation(getLogoutPageLocation());
+ //getUI().getPage().setLocation(getLogoutPageLocation());
}
}
diff --git a/src/main/java/org/s4s/gui/InitView.java b/src/main/java/org/s4s/gui/InitView.java
index 2046387be3b404be8b7d92666c5d1ad379ae6fde..c77e89f46e728729084038520222de325ed58fd1 100644
--- a/src/main/java/org/s4s/gui/InitView.java
+++ b/src/main/java/org/s4s/gui/InitView.java
@@ -46,8 +46,7 @@ public class InitView extends UI {
//Test der RegistrierungsView
UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
//UI.getCurrent().getNavigator().navigateTo(Views.REGISTRIERUNG);
- this.addStyleName("customShell");
- this.setWidth(64f, Unit.PERCENTAGE);
+ //this.setWidth(64f, Unit.PERCENTAGE);
}
@WebServlet(urlPatterns = "/*", name = "MyUIServlet", asyncSupported = true)
diff --git a/src/main/java/org/s4s/gui/views/TemplateView.java b/src/main/java/org/s4s/gui/views/TemplateView.java
index 44868b6570b3b63bd5687169784ab7daee6827bf..a5d0d79b8274a86d0fb11149ff0347140f7fd12c 100644
--- a/src/main/java/org/s4s/gui/views/TemplateView.java
+++ b/src/main/java/org/s4s/gui/views/TemplateView.java
@@ -2,20 +2,20 @@ package org.s4s.gui.views;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.server.FileResource;
-import com.vaadin.server.FontAwesome;
-import com.vaadin.server.ThemeResource;
-import com.vaadin.server.VaadinService;
+import com.vaadin.server.*;
import com.vaadin.ui.*;
import com.vaadin.ui.themes.BaseTheme;
import java.io.File;
+
+import org.s4s.services.util.Roles;
import org.s4s.services.util.Views;
/**
* Created by Max-Desktop on 14.05.2017.
*/
-public class TemplateView extends VerticalLayout implements View {
+public class TemplateView extends GridLayout implements View {
+ VaadinSession session = UI.getCurrent().getSession();
private Image createLogo() {
HorizontalLayout logoLayout = new HorizontalLayout();
@@ -37,21 +37,45 @@ public class TemplateView extends VerticalLayout implements View {
public void enter(ViewChangeListener.ViewChangeEvent viewChangeEvent) {
}
+ public void setLoginButton () {
+
+ }
+
public void setUpFooterAndHeader(AbstractComponent content) {
//HEADER
- final GridLayout headerLayout = new GridLayout(3,1);
-
+
+
+ final GridLayout headerLayout = new GridLayout(3,1);
//@Max: Logo eingefügt, brauchen wir meiner Meinung nach nicht mehr. #svolle2s
+ headerLayout.setSpacing(true);
+ // refactored Code --> header and Footer are outsourced by there own methodes #mkomp2s
+ HorizontalLayout navigationPanelGrid = buildNavigationHeader();
+ HorizontalLayout footerLayout = buildFooter();
+
+ //Final Content warpping Header and Footer around Content #mkomp2s
+ final VerticalLayout mainLayout = new VerticalLayout(headerLayout,navigationPanelGrid, content, footerLayout);
+ mainLayout.setSizeFull();
+ mainLayout.setExpandRatio(content, 1);
+ mainLayout.setSpacing(true);
+ mainLayout.setComponentAlignment(footerLayout, Alignment.BOTTOM_CENTER);
+
+
+ addComponent(mainLayout);
-/* Label lblTitle = new Label("S4S Das Shop in Shop System");
- headerLayout.addComponent(lblTitle,1,0);
- headerLayout.setComponentAlignment(lblTitle, Alignment.TOP_CENTER);
-*/ headerLayout.setSpacing(true);
-
- final HorizontalLayout navigationPanelGrid = new HorizontalLayout();
+
+ mainLayout.setWidthUndefined();
+ //setComponentAlignment(navigationPanelGrid,Alignment.MIDDLE_CENTER);
+ setComponentAlignment(mainLayout,Alignment.MIDDLE_CENTER);
+ this.setSpacing(true);
+ this.setHeightUndefined();
+ this.setMargin(true);
+ }
+
+ HorizontalLayout buildNavigationHeader () {
+ HorizontalLayout navigationPanelGrid = new HorizontalLayout();
MenuBar.Command mycommand = new MenuBar.Command() {
public void menuSelected(MenuBar.MenuItem selectedItem) {
System.out.println(selectedItem);
@@ -68,11 +92,18 @@ public class TemplateView extends VerticalLayout implements View {
case "Kasse":
UI.getCurrent().getNavigator().navigateTo(Views.CHECKOUT);
break;
-
- case "Mein Konto":
+ case "Login":
UI.getCurrent().getNavigator().navigateTo(Views.LOGIN);
break;
-
+ case "Registrieren":
+ UI.getCurrent().getNavigator().navigateTo(Views.REGISTRIERUNG);
+ break;
+ case "Einstellungen":
+ UI.getCurrent().getNavigator().navigateTo(Views.BENUTZERKONTO);
+ break;
+ case "Logout":
+ UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
+ break;
case "Kontakt":
UI.getCurrent().getNavigator().navigateTo(Views.CONTACT);
break;
@@ -91,54 +122,65 @@ public class TemplateView extends VerticalLayout implements View {
MenuBar.MenuItem categoryItem = barmenu.addItem("Kategorien", null, null);
categoryItem.addItem("Literatur", null, mycommand);
categoryItem.addItem("Mitschriften", null, mycommand);
- categoryItem.addItem("Currywurst", null, mycommand);
+
+
// Yet another top-level item
MenuBar.MenuItem shoppingCardItem = barmenu.addItem("Warenkorb", null, mycommand);
MenuBar.MenuItem checktoutItem = barmenu.addItem("Kasse", null, mycommand);
- MenuBar.MenuItem accountItem = barmenu.addItem("Mein Konto", null, mycommand);
- MenuBar.MenuItem contactItem = barmenu.addItem("Kontakt", null, mycommand);
+ MenuBar.MenuItem loginItem = barmenu.addItem("Login", null, mycommand);
+ MenuBar.MenuItem registerItem = barmenu.addItem("Registrieren", null, mycommand);
+ MenuBar.MenuItem userItem = barmenu.addItem("Mein Konto", null, null);
+ userItem.addItem("Einstellungen", null, mycommand);
+ userItem.addItem("Logout", null, mycommand);
TextField tfSeach = new TextField();
Button btnSearch = new Button("Suche" , FontAwesome.SEARCH);
-
-
+
+
navigationPanelGrid.addComponent(createLogo());
navigationPanelGrid.addComponent(barmenu);
navigationPanelGrid.addComponent(tfSeach);
navigationPanelGrid.addComponent(btnSearch);
navigationPanelGrid.setSpacing(true);
+ navigationPanelGrid.setSizeUndefined();
+ if (session.getAttribute(Roles.CURRENTUSER) == null){
+ userItem.setVisible(false);
+ } else {
+ registerItem.setVisible(false);
+ loginItem.setVisible(false);
+ }
+ navigationPanelGrid.setStyleName("navbarGardient");
+ navigationPanelGrid.setComponentAlignment(barmenu,Alignment.MIDDLE_CENTER);
+ navigationPanelGrid.setComponentAlignment(tfSeach,Alignment.MIDDLE_CENTER);
+ navigationPanelGrid.setComponentAlignment(btnSearch,Alignment.MIDDLE_CENTER);
+
+ return navigationPanelGrid;
+ }
-
-
+ HorizontalLayout buildFooter () {
//FOOTER
- final VerticalLayout footerLayout = new VerticalLayout();
+ HorizontalLayout footerLayout = new HorizontalLayout();
Button btnImpressum = new Button("Impressum");
+ Button btnContact = new Button("Kontakt");
+
btnImpressum.setStyleName(BaseTheme.BUTTON_LINK);
+ btnContact.setStyleName(BaseTheme.BUTTON_LINK);
+
footerLayout.addComponent(btnImpressum);
+ footerLayout.addComponent(btnContact);
+
btnImpressum.addClickListener((Button.ClickEvent event) -> {
UI.getCurrent().getNavigator().navigateTo(Views.IMPRESSUM);
});
-
-
- // Footer Section
- final VerticalLayout mainLayout = new VerticalLayout(headerLayout,navigationPanelGrid, content, footerLayout);
- mainLayout.setSizeFull();
- mainLayout.setExpandRatio(content, 1);
- mainLayout.setSpacing(true);
- mainLayout.setComponentAlignment(footerLayout, Alignment.BOTTOM_CENTER);
- addComponent(mainLayout);
-
- this.setSpacing(true);
- this.setHeightUndefined();
- //this.setMargin(true);
- //setComponentAlignment(headerLayout, Alignment.TOP_CENTER);
- //setComponentAlignment(footerLayout, Alignment.TOP_CENTER);
+ btnContact.addClickListener((Button.ClickEvent event) -> {
+ UI.getCurrent().getNavigator().navigateTo(Views.CONTACT);
+ });
+ footerLayout.setStyleName("customfooter");
+ return footerLayout;
}
-
-
}
diff --git a/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss b/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
index 8259e78e4a56deeb7b22ec411f9bf79eb138791e..f070c43a0b76ff683c20d92dc1de81904e4dd43f 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
+++ b/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
@@ -36,8 +36,37 @@
// Insert your own theme rules here
.customShell{
- margin-left: 18%;
- margin-right: 18%;
+ width:1024px;
+ margin: 0 auto;
}
+
+ .customfooter {
+ position:fixed;
+ left:0px;
+ bottom:0px;
+ height:62px;
+ width:100%;
+ background:silver;
+ }
+
+ .navbarGardient {
+ position:fixed;
+ top: 0px;
+ width:100%;
+
+ /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#feccb1+5,ea5507+44,ea5507+52,f17432+65,f17432+65,fb955e+87 */
+ background: #feccb1; /* Old browsers */
+ background: -moz-linear-gradient(top, #feccb1 5%, #ea5507 44%, #ea5507 52%, #f17432 65%, #f17432 65%, #fb955e 87%); /* FF3.6-15 */
+ background: -webkit-linear-gradient(top, #feccb1 5%,#ea5507 44%,#ea5507 52%,#f17432 65%,#f17432 65%,#fb955e 87%); /* Chrome10-25,Safari5.1-6 */
+ background: linear-gradient(to bottom, #feccb1 5%,#ea5507 44%,#ea5507 52%,#f17432 65%,#f17432 65%,#fb955e 87%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#feccb1', endColorstr='#fb955e',GradientType=0 ); /* IE6-9 */
+ }
+ .v-button-link{
+ color: #000;
+}
+
+ .v-button-link:hover{
+ color: dimgrey;
+ }
}
diff --git a/src/main/webapp/VAADIN/themes/mytheme/styles.css b/src/main/webapp/VAADIN/themes/mytheme/styles.css
index aa25f595472df63b5f3f5105f87032347af5dce7..194806cdc182b2451184ed648eaf60e6a24accb0 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/styles.css
+++ b/src/main/webapp/VAADIN/themes/mytheme/styles.css
@@ -12986,6 +12986,34 @@ div.v-layout.v-horizontal.v-widget {
}
.mytheme .customShell {
- margin-left: 18%;
- margin-right: 18%;
+ width: 1024px;
+ margin: 0 auto;
+}
+
+.mytheme .customfooter {
+ position: fixed;
+ left: 0px;
+ bottom: 0px;
+ height: 62px;
+ width: 100%;
+ background: silver;
+}
+
+.mytheme .navbarGardient {
+ position: fixed;
+ top: 0px;
+ width: 100%;
+ background: #feccb1;
+ background: -moz-linear-gradient(top, #feccb1 5%, #ea5507 44%, #ea5507 52%, #f17432 65%, #f17432 65%, #fb955e 87%);
+ background: -webkit-linear-gradient(top, #feccb1 5%, #ea5507 44%, #ea5507 52%, #f17432 65%, #f17432 65%, #fb955e 87%);
+ background: linear, to bottom, #feccb1 5%, #ea5507 44%, #ea5507 52%, #f17432 65%, #f17432 65%, #fb955e 87%;
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#feccb1', endColorstr='#fb955e',GradientType=0 );
+}
+
+.mytheme .v-button-link {
+ color: #000;
+}
+
+.mytheme .v-button-link:hover {
+ color: dimgrey;
}
\ No newline at end of file
diff --git a/src/main/webapp/VAADIN/themes/mytheme/styles.scss b/src/main/webapp/VAADIN/themes/mytheme/styles.scss
index bba1d493c0c0dad0be8dae040a2007535c8720ad..75affeef93f90c658ad961f683406e216fff6910 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/styles.scss
+++ b/src/main/webapp/VAADIN/themes/mytheme/styles.scss
@@ -1,11 +1,9 @@
@import "mytheme.scss";
@import "addons.scss";
-
// This file prefixes all rules with the theme name to avoid causing conflicts with other themes.
// The actual styles should be defined in mytheme.scss
.mytheme {
@include addons;
@include mytheme;
-
}