diff --git a/pom.xml b/pom.xml index 64ca99a..0099934 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ - 20240820_2 + 20240910 diff --git a/src/main/java/de/geis/portal/workplace/layout/DefaultLayout.java b/src/main/java/de/geis/portal/workplace/layout/DefaultLayout.java new file mode 100644 index 0000000..ee25f8c --- /dev/null +++ b/src/main/java/de/geis/portal/workplace/layout/DefaultLayout.java @@ -0,0 +1,107 @@ +package de.geis.portal.workplace.layout; + +import java.io.Serializable; + +import org.eclnt.jsfserver.resources.ResourceManager; + +public class DefaultLayout implements LayoutInterface, Serializable { + + private static final long serialVersionUID = 2030247226246332983L; + + @Override + public String getLogoPathTop() { + return null; + } + + @Override + public String getLogoPathLeft() { + return "/images/logos/geis.png"; + } + + @Override + public String getTitelText() { + return ResourceManager.getRuntimeInstance().readProperty("literalsWorkplace", "titeldefaultportal"); + } + + @Override + public String getTitel2Text() { + return ResourceManager.getRuntimeInstance().readProperty("literalsWorkplace", "titeldefaultportal2"); + } + + @Override + public String getTitelTopText() { + return "Webportal - Geis Gruppe"; + } + + // Update from MainBean showLogin() + private String m_impressumLink = null; //"https://geis-group.eu/impressum"; + @Override + public String getImpressumLink() { + return m_impressumLink; + } + + // Update from MainBean showLogin() + private String m_kontaktLink = null; //"https://geis-group.eu/kontakt"; + @Override + public String getKontaktLink() { + return m_kontaktLink; + } + + + private String m_countryLanguage = "de_DE"; + @Override + public String getCountryLanguage() { + return m_countryLanguage; + } + public void updateCountryLanguageAndLinks(String countryLanguage) { + this.m_countryLanguage = countryLanguage; + updateKontaktAndImpressumLink(countryLanguage); + } + + private void updateKontaktAndImpressumLink(String countryLanguage) { +// System.out.println("updateKontaktAndImpressumLink: " + countryLanguage); + switch (countryLanguage) { + case "de_DE": + m_kontaktLink = "https://geis-group.eu/kontakt"; + m_impressumLink = "https://geis-group.eu/impressum"; + break; + + case "en_US": + m_kontaktLink = "https://geis-group.eu/en/contact"; + m_impressumLink = "https://geis-group.eu/en/imprint"; + break; + + case "cs_CZ": + m_kontaktLink = "https://geis-group.eu/en/contact"; + m_impressumLink = "https://geis-group.eu/en/imprint"; + break; + + case "pl_PL": + m_kontaktLink = "https://geis-group.eu/en/contact"; + m_impressumLink = "https://geis-group.eu/en/imprint"; + break; + + default: + m_kontaktLink = "https://geis-group.eu/kontakt"; + m_impressumLink = "https://geis-group.eu/impressum"; + break; + } + + } + + @Override + public boolean getShowLogoRight() { + return false; + } + + @Override + public boolean getShowGTMS() { + return false; + } + + @Override + public boolean getShowLOG() { + return true; + } + +} diff --git a/src/main/java/de/geis/portal/workplace/layout/LayoutInterface.java b/src/main/java/de/geis/portal/workplace/layout/LayoutInterface.java new file mode 100644 index 0000000..1b26171 --- /dev/null +++ b/src/main/java/de/geis/portal/workplace/layout/LayoutInterface.java @@ -0,0 +1,17 @@ +package de.geis.portal.workplace.layout; + +public interface LayoutInterface { + + public String getLogoPathTop(); + public String getLogoPathLeft(); + public String getTitelTopText(); + public String getTitelText(); + public String getTitel2Text(); + public String getImpressumLink(); + public String getKontaktLink(); + public String getCountryLanguage(); + public boolean getShowLogoRight(); + public boolean getShowGTMS(); + public boolean getShowLOG(); + +} diff --git a/src/main/java/de/geis/portal/workplace/layout/LayoutManager.java b/src/main/java/de/geis/portal/workplace/layout/LayoutManager.java new file mode 100644 index 0000000..92708a5 --- /dev/null +++ b/src/main/java/de/geis/portal/workplace/layout/LayoutManager.java @@ -0,0 +1,35 @@ +package de.geis.portal.workplace.layout; + +import java.io.Serializable; + +import org.eclnt.jsfserver.util.HttpSessionAccess; + +import jakarta.servlet.http.HttpServletRequest; + +public class LayoutManager implements Serializable { + + private static final long serialVersionUID = 1722243909044740449L; + + public static final DefaultLayout getLayoutObject() { + + HttpServletRequest request = HttpSessionAccess.getCurrentRequest(); + String url = request.getHeader("eclnt-originalurl"); + +// System.out.println("eclnt-originalurl: " + url); + +// if (url != null && url.contains("g-tms")) { +// return new GtmsLayout(); +// } else if (url != null && (url.contains("ccp.") || url.contains("ccp-test."))) { +// return new GtmsLayout(); +// } else if (url != null && url.contains("geis")) { +// //Geis must be last one +// return new GeisLayout(); +// } else if (url != null && (url.contains("okay") || url.contains("husqvarna"))) { +// //Geis must be last one +// return new DefaultLayout(); +// } else { + return new DefaultLayout(); +// } + } + +} diff --git a/src/main/java/de/tvo/workplace/DefaultWorkplaceBean.java b/src/main/java/de/tvo/workplace/DefaultWorkplaceBean.java index deab283..7aafd93 100644 --- a/src/main/java/de/tvo/workplace/DefaultWorkplaceBean.java +++ b/src/main/java/de/tvo/workplace/DefaultWorkplaceBean.java @@ -5,6 +5,8 @@ import org.eclnt.editor.annotations.CCGenClass; import org.eclnt.workplace.IWorkpageDispatcher; import org.eclnt.workplace.WorkpageDispatchedPageBean; +import de.geis.portal.workplace.layout.DefaultLayout; + import org.eclnt.jsfserver.base.faces.event.ActionEvent; @CCGenClass (expressionBase="#{d.DefaultWorkplaceBean}") @@ -13,13 +15,30 @@ public class DefaultWorkplaceBean extends WorkpageDispatchedPageBean implements Serializable { - // ------------------------------------------------------------------------ + public void onMenuToggleAction(org.eclnt.jsfserver.base.faces.event.ActionEvent event) { + if (getMenuToggle()) { + m_menuPageBean = new MenuPageBean(); + } else { + m_menuPageBean = null; + } + } + + boolean m_menuToggle = false; + public boolean getMenuToggle() { return m_menuToggle; } + public void setMenuToggle(boolean value) { this.m_menuToggle = value; } + + MenuPageBean m_menuPageBean = null; + public MenuPageBean getMenuPageBean() { return m_menuPageBean; } + + // ------------------------------------------------------------------------ // inner classes // ------------------------------------------------------------------------ + private DefaultLayout m_layout; + public DefaultLayout getLayout() { return m_layout; } - /* Listener to the user of the page bean. */ - public interface IListener extends Serializable - { + /* Listener to the user of the page bean. */ + public interface IListener extends Serializable { + public void logout(); } // ------------------------------------------------------------------------ @@ -32,9 +51,11 @@ public class DefaultWorkplaceBean // constructors & initialization // ------------------------------------------------------------------------ - public DefaultWorkplaceBean(IWorkpageDispatcher workpageDispatcher) + public DefaultWorkplaceBean(IWorkpageDispatcher workpageDispatcher, DefaultLayout defaultLayout) { - super(workpageDispatcher); + super(workpageDispatcher); + m_layout = defaultLayout; + } public String getPageName() { return "/workplace/defaultWorkplace.xml"; } diff --git a/src/main/java/de/tvo/workplace/MainPage.java b/src/main/java/de/tvo/workplace/MainPage.java new file mode 100644 index 0000000..3beb6d4 --- /dev/null +++ b/src/main/java/de/tvo/workplace/MainPage.java @@ -0,0 +1,134 @@ +package de.tvo.workplace; + +import java.io.Serializable; + +import org.eclnt.editor.annotations.CCGenClass; +import org.eclnt.jsfserver.elements.util.Trigger; +import org.eclnt.jsfserver.pagebean.IPageBean; +import org.eclnt.jsfserver.util.HttpSessionAccess; +import org.eclnt.workplace.IWorkpageDispatcher; +import org.eclnt.workplace.WorkpageDispatchedPageBean; + +import de.geis.portal.workplace.layout.DefaultLayout; +import de.geis.portal.workplace.layout.LayoutManager; +import jakarta.servlet.http.HttpSession; + +@CCGenClass (expressionBase="#{d.MainPage}") + +public class MainPage extends WorkpageDispatchedPageBean implements Serializable { + + private boolean DEBUG = false; + + boolean m_mobileDevice = false; + + public boolean getMobileDevice() { return m_mobileDevice; } + + public void setMobileDevice(boolean value) { m_mobileDevice = value; } + + Trigger m_scriptTrigger = new Trigger(); + + public Trigger getScriptTrigger() { return m_scriptTrigger; } + + String m_scriptText; + + public String getScriptText() { return m_scriptText; } + + public void setScriptText(String value) { m_scriptText = value; } + + String m_title; + + public String getTitle() { return m_title; } + + public void setTitle(String value) { m_title = value; } + + boolean m_confirmExit = false; + + public boolean getConfirmExit() { return m_confirmExit; } + + public void setConfirmExit(boolean value) { m_confirmExit = value; } + + private static final long serialVersionUID = 2944301072965627253L; + + private IPageBean currentPage = null; + + public IPageBean getCurrentPage() { return currentPage; } + + public void setCurrentPage(IPageBean currentPage) { this.currentPage = currentPage; } + + public DefaultLayout layout = LayoutManager.getLayoutObject(); + + public DefaultLayout getLayout() { return layout; } + + + // ------------------------------------------------------------------------ + // inner classes + // ------------------------------------------------------------------------ + + /* Listener to the user of the page bean. */ + public interface IListener extends Serializable { + + + } + + // ------------------------------------------------------------------------ + // members + // ------------------------------------------------------------------------ + + private IListener m_listener; + + // ------------------------------------------------------------------------ + // constructors & initialization + // ------------------------------------------------------------------------ + + public MainPage(IWorkpageDispatcher workpageDispatcher) { + super(workpageDispatcher); + showDefaultWorkplace(); + } + + + @SuppressWarnings("unused") + private void showDefaultWorkplace() { + DefaultWorkplaceBean dwp = new DefaultWorkplaceBean(getOwningDispatcher(), layout); //, getSessionVars()); + + DefaultWorkplaceBean.IListener listener = new DefaultWorkplaceBean.IListener() { + + private static final long serialVersionUID = -4934826046496488251L; + + @Override + public void logout() { + HttpSession httpSession = HttpSessionAccess.getCurrentHttpSession(); + String sessionID = httpSession.getId(); + //SessionHandler.logoutSession(sessionID); + + try { + //showLogin(); + } catch (IllegalStateException ise) { + if (!ise.getMessage().equals("getAttribute: Session already invalidated") && !ise.getMessage().equals("getAttribute: Session already invalidated")) { + ise.printStackTrace(); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + }; + dwp.prepare(listener); + currentPage = dwp; + } + + public String getPageName() { return "/main.xml"; } + public String getRootExpressionUsedInPage() { return "#{d.MainPage}"; } + + // ------------------------------------------------------------------------ + // public usage + // ------------------------------------------------------------------------ + + /* Initialization of the bean. Add any parameter that is required within your scenario. */ + public void prepare(IListener listener) + { + m_listener = listener; + } + + // ------------------------------------------------------------------------ + // private usage + // ------------------------------------------------------------------------ +} diff --git a/src/main/java/managedbeans/MainPage.java b/src/main/java/de/tvo/workplace/MenuPageBean.java similarity index 69% rename from src/main/java/managedbeans/MainPage.java rename to src/main/java/de/tvo/workplace/MenuPageBean.java index 61c16df..46ef8ef 100644 --- a/src/main/java/managedbeans/MainPage.java +++ b/src/main/java/de/tvo/workplace/MenuPageBean.java @@ -1,21 +1,22 @@ -package managedbeans; +package de.tvo.workplace; import java.io.Serializable; - import org.eclnt.editor.annotations.CCGenClass; -import org.eclnt.jsfserver.pagebean.IPageBean; import org.eclnt.jsfserver.pagebean.PageBean; -import de.tvo.workplace.TestPageBean; +import org.eclnt.jsfserver.base.faces.event.ActionEvent; -@CCGenClass (expressionBase="#{d.MainPage}") +@CCGenClass (expressionBase="#{d.MenuPageBean}") -public class MainPage +public class MenuPageBean extends PageBean implements Serializable { - IPageBean m_mainPage; - public IPageBean getMainPage() { return m_mainPage; } + public void onFixierenToggleAction(org.eclnt.jsfserver.base.faces.event.ActionEvent event) {} + + boolean m_fixierenToggle = false; + public boolean getFixierenToggle() { return m_fixierenToggle; } + public void setFixierenToggle(boolean value) { this.m_fixierenToggle = value; } // ------------------------------------------------------------------------ // inner classes @@ -36,12 +37,12 @@ public class MainPage // constructors & initialization // ------------------------------------------------------------------------ - public MainPage() { - m_mainPage = new TestPageBean(); + public MenuPageBean() + { } - public String getPageName() { return "/main.xml"; } - public String getRootExpressionUsedInPage() { return "#{d.MainPage}"; } + public String getPageName() { return "/workplace/menuPage.xml"; } + public String getRootExpressionUsedInPage() { return "#{d.MenuPageBean}"; } // ------------------------------------------------------------------------ // public usage diff --git a/src/main/webapp/images/Webshop/No-image-available.jpg b/src/main/webapp/images/Webshop/No-image-available.jpg new file mode 100644 index 0000000..d0d5588 Binary files /dev/null and b/src/main/webapp/images/Webshop/No-image-available.jpg differ diff --git a/src/main/webapp/images/Webshop/boxes.gif b/src/main/webapp/images/Webshop/boxes.gif new file mode 100644 index 0000000..0167655 Binary files /dev/null and b/src/main/webapp/images/Webshop/boxes.gif differ diff --git a/src/main/webapp/images/Webshop/emptyBox.gif b/src/main/webapp/images/Webshop/emptyBox.gif new file mode 100644 index 0000000..5e600c8 Binary files /dev/null and b/src/main/webapp/images/Webshop/emptyBox.gif differ diff --git a/src/main/webapp/images/Webshop/emptycart.jpeg b/src/main/webapp/images/Webshop/emptycart.jpeg new file mode 100644 index 0000000..4b9b4cb Binary files /dev/null and b/src/main/webapp/images/Webshop/emptycart.jpeg differ diff --git a/src/main/webapp/images/Webshop/imageComingSoon.jpg b/src/main/webapp/images/Webshop/imageComingSoon.jpg new file mode 100644 index 0000000..95a0664 Binary files /dev/null and b/src/main/webapp/images/Webshop/imageComingSoon.jpg differ diff --git a/src/main/webapp/images/Webshop/no_result_found.jpg b/src/main/webapp/images/Webshop/no_result_found.jpg new file mode 100644 index 0000000..d75c74f Binary files /dev/null and b/src/main/webapp/images/Webshop/no_result_found.jpg differ diff --git a/src/main/webapp/images/Webshop/no_result_found.png b/src/main/webapp/images/Webshop/no_result_found.png new file mode 100644 index 0000000..1127ac6 Binary files /dev/null and b/src/main/webapp/images/Webshop/no_result_found.png differ diff --git a/src/main/webapp/images/Webshop/noorder.jpg b/src/main/webapp/images/Webshop/noorder.jpg new file mode 100644 index 0000000..b50ce71 Binary files /dev/null and b/src/main/webapp/images/Webshop/noorder.jpg differ diff --git a/src/main/webapp/images/Webshop/noproduct.jpg b/src/main/webapp/images/Webshop/noproduct.jpg new file mode 100644 index 0000000..94373d7 Binary files /dev/null and b/src/main/webapp/images/Webshop/noproduct.jpg differ diff --git a/src/main/webapp/images/Webshop/noresult-lupe3.png b/src/main/webapp/images/Webshop/noresult-lupe3.png new file mode 100644 index 0000000..98e57c6 Binary files /dev/null and b/src/main/webapp/images/Webshop/noresult-lupe3.png differ diff --git a/src/main/webapp/images/Webshop/noresult.png b/src/main/webapp/images/Webshop/noresult.png new file mode 100644 index 0000000..1d4f159 Binary files /dev/null and b/src/main/webapp/images/Webshop/noresult.png differ diff --git a/src/main/webapp/images/Webshop/noresultfound.png b/src/main/webapp/images/Webshop/noresultfound.png new file mode 100644 index 0000000..47d5276 Binary files /dev/null and b/src/main/webapp/images/Webshop/noresultfound.png differ diff --git a/src/main/webapp/images/Webshop/order_is_complete.jpg b/src/main/webapp/images/Webshop/order_is_complete.jpg new file mode 100644 index 0000000..9f49c2e Binary files /dev/null and b/src/main/webapp/images/Webshop/order_is_complete.jpg differ diff --git a/src/main/webapp/images/Webshop/user 18.png b/src/main/webapp/images/Webshop/user 18.png new file mode 100644 index 0000000..98b9860 Binary files /dev/null and b/src/main/webapp/images/Webshop/user 18.png differ diff --git a/src/main/webapp/images/logistics/forklift.png b/src/main/webapp/images/logistics/forklift.png new file mode 100644 index 0000000..640d72a Binary files /dev/null and b/src/main/webapp/images/logistics/forklift.png differ diff --git a/src/main/webapp/images/logistics/truck.png b/src/main/webapp/images/logistics/truck.png new file mode 100644 index 0000000..342b893 Binary files /dev/null and b/src/main/webapp/images/logistics/truck.png differ diff --git a/src/main/webapp/images/workplace/Administration@16px.png b/src/main/webapp/images/workplace/Administration@16px.png new file mode 100644 index 0000000..12b9821 Binary files /dev/null and b/src/main/webapp/images/workplace/Administration@16px.png differ diff --git a/src/main/webapp/images/workplace/Administration@16pxgrau.png b/src/main/webapp/images/workplace/Administration@16pxgrau.png new file mode 100644 index 0000000..d314458 Binary files /dev/null and b/src/main/webapp/images/workplace/Administration@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Administration@32px.png b/src/main/webapp/images/workplace/Administration@32px.png new file mode 100644 index 0000000..8294383 Binary files /dev/null and b/src/main/webapp/images/workplace/Administration@32px.png differ diff --git a/src/main/webapp/images/workplace/Administration@32pxgrau.png b/src/main/webapp/images/workplace/Administration@32pxgrau.png new file mode 100644 index 0000000..4d70da2 Binary files /dev/null and b/src/main/webapp/images/workplace/Administration@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/AirSea@16px.png b/src/main/webapp/images/workplace/AirSea@16px.png new file mode 100644 index 0000000..7a1f553 Binary files /dev/null and b/src/main/webapp/images/workplace/AirSea@16px.png differ diff --git a/src/main/webapp/images/workplace/AirSea@16pxgrau.png b/src/main/webapp/images/workplace/AirSea@16pxgrau.png new file mode 100644 index 0000000..2db94ce Binary files /dev/null and b/src/main/webapp/images/workplace/AirSea@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/AirSea@32px.png b/src/main/webapp/images/workplace/AirSea@32px.png new file mode 100644 index 0000000..cc41750 Binary files /dev/null and b/src/main/webapp/images/workplace/AirSea@32px.png differ diff --git a/src/main/webapp/images/workplace/AirSea@32pxgrau.png b/src/main/webapp/images/workplace/AirSea@32pxgrau.png new file mode 100644 index 0000000..bd697bb Binary files /dev/null and b/src/main/webapp/images/workplace/AirSea@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Ausloggen@16px.png b/src/main/webapp/images/workplace/Ausloggen@16px.png new file mode 100644 index 0000000..e1cf513 Binary files /dev/null and b/src/main/webapp/images/workplace/Ausloggen@16px.png differ diff --git a/src/main/webapp/images/workplace/Ausloggen@16pxgrau.png b/src/main/webapp/images/workplace/Ausloggen@16pxgrau.png new file mode 100644 index 0000000..1e8c391 Binary files /dev/null and b/src/main/webapp/images/workplace/Ausloggen@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Ausloggen@32px.png b/src/main/webapp/images/workplace/Ausloggen@32px.png new file mode 100644 index 0000000..f01f763 Binary files /dev/null and b/src/main/webapp/images/workplace/Ausloggen@32px.png differ diff --git a/src/main/webapp/images/workplace/Ausloggen@32pxgrau.png b/src/main/webapp/images/workplace/Ausloggen@32pxgrau.png new file mode 100644 index 0000000..1a1b4ff Binary files /dev/null and b/src/main/webapp/images/workplace/Ausloggen@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Customer Service@16px.png b/src/main/webapp/images/workplace/Customer Service@16px.png new file mode 100644 index 0000000..99f7660 Binary files /dev/null and b/src/main/webapp/images/workplace/Customer Service@16px.png differ diff --git a/src/main/webapp/images/workplace/Customer Service@16pxgrau.png b/src/main/webapp/images/workplace/Customer Service@16pxgrau.png new file mode 100644 index 0000000..112f6a2 Binary files /dev/null and b/src/main/webapp/images/workplace/Customer Service@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Customer Service@32px.png b/src/main/webapp/images/workplace/Customer Service@32px.png new file mode 100644 index 0000000..777c741 Binary files /dev/null and b/src/main/webapp/images/workplace/Customer Service@32px.png differ diff --git a/src/main/webapp/images/workplace/Customer Service@32pxgrau.png b/src/main/webapp/images/workplace/Customer Service@32pxgrau.png new file mode 100644 index 0000000..c1e8ba9 Binary files /dev/null and b/src/main/webapp/images/workplace/Customer Service@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Drucken@16px.png b/src/main/webapp/images/workplace/Drucken@16px.png new file mode 100644 index 0000000..da8fa7f Binary files /dev/null and b/src/main/webapp/images/workplace/Drucken@16px.png differ diff --git a/src/main/webapp/images/workplace/Drucken@16pxgrau.png b/src/main/webapp/images/workplace/Drucken@16pxgrau.png new file mode 100644 index 0000000..33bf24c Binary files /dev/null and b/src/main/webapp/images/workplace/Drucken@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Drucken@32px.png b/src/main/webapp/images/workplace/Drucken@32px.png new file mode 100644 index 0000000..d85d4cc Binary files /dev/null and b/src/main/webapp/images/workplace/Drucken@32px.png differ diff --git a/src/main/webapp/images/workplace/Drucken@32pxgrau.png b/src/main/webapp/images/workplace/Drucken@32pxgrau.png new file mode 100644 index 0000000..bc7f735 Binary files /dev/null and b/src/main/webapp/images/workplace/Drucken@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/E-Mail@16px.png b/src/main/webapp/images/workplace/E-Mail@16px.png new file mode 100644 index 0000000..1f095bf Binary files /dev/null and b/src/main/webapp/images/workplace/E-Mail@16px.png differ diff --git a/src/main/webapp/images/workplace/E-Mail@16pxgrau.png b/src/main/webapp/images/workplace/E-Mail@16pxgrau.png new file mode 100644 index 0000000..7ff3330 Binary files /dev/null and b/src/main/webapp/images/workplace/E-Mail@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/E-Mail@32px.png b/src/main/webapp/images/workplace/E-Mail@32px.png new file mode 100644 index 0000000..80fd497 Binary files /dev/null and b/src/main/webapp/images/workplace/E-Mail@32px.png differ diff --git a/src/main/webapp/images/workplace/E-Mail@32pxgrau.png b/src/main/webapp/images/workplace/E-Mail@32pxgrau.png new file mode 100644 index 0000000..d50b5cc Binary files /dev/null and b/src/main/webapp/images/workplace/E-Mail@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Einstellungen@16px.png b/src/main/webapp/images/workplace/Einstellungen@16px.png new file mode 100644 index 0000000..c729324 Binary files /dev/null and b/src/main/webapp/images/workplace/Einstellungen@16px.png differ diff --git a/src/main/webapp/images/workplace/Einstellungen@16pxgrau.png b/src/main/webapp/images/workplace/Einstellungen@16pxgrau.png new file mode 100644 index 0000000..bb56a49 Binary files /dev/null and b/src/main/webapp/images/workplace/Einstellungen@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Einstellungen@32px.png b/src/main/webapp/images/workplace/Einstellungen@32px.png new file mode 100644 index 0000000..d06a463 Binary files /dev/null and b/src/main/webapp/images/workplace/Einstellungen@32px.png differ diff --git a/src/main/webapp/images/workplace/Einstellungen@32pxgrau.png b/src/main/webapp/images/workplace/Einstellungen@32pxgrau.png new file mode 100644 index 0000000..b278d45 Binary files /dev/null and b/src/main/webapp/images/workplace/Einstellungen@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Favorit@16px.png b/src/main/webapp/images/workplace/Favorit@16px.png new file mode 100644 index 0000000..b6b65f5 Binary files /dev/null and b/src/main/webapp/images/workplace/Favorit@16px.png differ diff --git a/src/main/webapp/images/workplace/Favorit@16pxgrau.png b/src/main/webapp/images/workplace/Favorit@16pxgrau.png new file mode 100644 index 0000000..ce686cd Binary files /dev/null and b/src/main/webapp/images/workplace/Favorit@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Favorit@32px.png b/src/main/webapp/images/workplace/Favorit@32px.png new file mode 100644 index 0000000..ae9cbbe Binary files /dev/null and b/src/main/webapp/images/workplace/Favorit@32px.png differ diff --git a/src/main/webapp/images/workplace/Favorit@32pxgrau.png b/src/main/webapp/images/workplace/Favorit@32pxgrau.png new file mode 100644 index 0000000..02252c9 Binary files /dev/null and b/src/main/webapp/images/workplace/Favorit@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Home@16px.png b/src/main/webapp/images/workplace/Home@16px.png new file mode 100644 index 0000000..e6150b6 Binary files /dev/null and b/src/main/webapp/images/workplace/Home@16px.png differ diff --git a/src/main/webapp/images/workplace/Home@16pxgrau.png b/src/main/webapp/images/workplace/Home@16pxgrau.png new file mode 100644 index 0000000..41af02d Binary files /dev/null and b/src/main/webapp/images/workplace/Home@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Home@32px.png b/src/main/webapp/images/workplace/Home@32px.png new file mode 100644 index 0000000..20df841 Binary files /dev/null and b/src/main/webapp/images/workplace/Home@32px.png differ diff --git a/src/main/webapp/images/workplace/Home@32pxgrau.png b/src/main/webapp/images/workplace/Home@32pxgrau.png new file mode 100644 index 0000000..e525ec5 Binary files /dev/null and b/src/main/webapp/images/workplace/Home@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Icon_LKW_Grau_Links_16px.png b/src/main/webapp/images/workplace/Icon_LKW_Grau_Links_16px.png new file mode 100644 index 0000000..dc85176 Binary files /dev/null and b/src/main/webapp/images/workplace/Icon_LKW_Grau_Links_16px.png differ diff --git a/src/main/webapp/images/workplace/Icon_LKW_Links_Rot_16px.png b/src/main/webapp/images/workplace/Icon_LKW_Links_Rot_16px.png new file mode 100644 index 0000000..cabae2a Binary files /dev/null and b/src/main/webapp/images/workplace/Icon_LKW_Links_Rot_16px.png differ diff --git a/src/main/webapp/images/workplace/Icon_LKW_Rechts_Grau_16px.png b/src/main/webapp/images/workplace/Icon_LKW_Rechts_Grau_16px.png new file mode 100644 index 0000000..aeff174 Binary files /dev/null and b/src/main/webapp/images/workplace/Icon_LKW_Rechts_Grau_16px.png differ diff --git a/src/main/webapp/images/workplace/Icon_LKW_Rechts_Rot_16px.png b/src/main/webapp/images/workplace/Icon_LKW_Rechts_Rot_16px.png new file mode 100644 index 0000000..79461ed Binary files /dev/null and b/src/main/webapp/images/workplace/Icon_LKW_Rechts_Rot_16px.png differ diff --git a/src/main/webapp/images/workplace/Icon_Maps_Grau_16px.png b/src/main/webapp/images/workplace/Icon_Maps_Grau_16px.png new file mode 100644 index 0000000..66e0525 Binary files /dev/null and b/src/main/webapp/images/workplace/Icon_Maps_Grau_16px.png differ diff --git a/src/main/webapp/images/workplace/Icon_Maps_Rot_16px.png b/src/main/webapp/images/workplace/Icon_Maps_Rot_16px.png new file mode 100644 index 0000000..70b5835 Binary files /dev/null and b/src/main/webapp/images/workplace/Icon_Maps_Rot_16px.png differ diff --git a/src/main/webapp/images/workplace/Icon_Standort_Grau_16px.png b/src/main/webapp/images/workplace/Icon_Standort_Grau_16px.png new file mode 100644 index 0000000..4bc6779 Binary files /dev/null and b/src/main/webapp/images/workplace/Icon_Standort_Grau_16px.png differ diff --git a/src/main/webapp/images/workplace/Icon_Standort_Rot_16px.png b/src/main/webapp/images/workplace/Icon_Standort_Rot_16px.png new file mode 100644 index 0000000..716554b Binary files /dev/null and b/src/main/webapp/images/workplace/Icon_Standort_Rot_16px.png differ diff --git a/src/main/webapp/images/workplace/Info@16px.png b/src/main/webapp/images/workplace/Info@16px.png new file mode 100644 index 0000000..0f1e58c Binary files /dev/null and b/src/main/webapp/images/workplace/Info@16px.png differ diff --git a/src/main/webapp/images/workplace/Info@16pxgrau.png b/src/main/webapp/images/workplace/Info@16pxgrau.png new file mode 100644 index 0000000..4f113c7 Binary files /dev/null and b/src/main/webapp/images/workplace/Info@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Info@32px.png b/src/main/webapp/images/workplace/Info@32px.png new file mode 100644 index 0000000..87d3107 Binary files /dev/null and b/src/main/webapp/images/workplace/Info@32px.png differ diff --git a/src/main/webapp/images/workplace/Info@32pxgrau.png b/src/main/webapp/images/workplace/Info@32pxgrau.png new file mode 100644 index 0000000..85be86f Binary files /dev/null and b/src/main/webapp/images/workplace/Info@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Logistics@16px.png b/src/main/webapp/images/workplace/Logistics@16px.png new file mode 100644 index 0000000..59a7d76 Binary files /dev/null and b/src/main/webapp/images/workplace/Logistics@16px.png differ diff --git a/src/main/webapp/images/workplace/Logistics@16pxgrau.png b/src/main/webapp/images/workplace/Logistics@16pxgrau.png new file mode 100644 index 0000000..a278c80 Binary files /dev/null and b/src/main/webapp/images/workplace/Logistics@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Logistics@32px.png b/src/main/webapp/images/workplace/Logistics@32px.png new file mode 100644 index 0000000..94505a3 Binary files /dev/null and b/src/main/webapp/images/workplace/Logistics@32px.png differ diff --git a/src/main/webapp/images/workplace/Logistics@32pxgrau.png b/src/main/webapp/images/workplace/Logistics@32pxgrau.png new file mode 100644 index 0000000..65ce949 Binary files /dev/null and b/src/main/webapp/images/workplace/Logistics@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Meine_Suche_16px.png b/src/main/webapp/images/workplace/Meine_Suche_16px.png new file mode 100644 index 0000000..b599a85 Binary files /dev/null and b/src/main/webapp/images/workplace/Meine_Suche_16px.png differ diff --git a/src/main/webapp/images/workplace/Meine_Suche_rot_16px.png b/src/main/webapp/images/workplace/Meine_Suche_rot_16px.png new file mode 100644 index 0000000..09dec41 Binary files /dev/null and b/src/main/webapp/images/workplace/Meine_Suche_rot_16px.png differ diff --git a/src/main/webapp/images/workplace/Menu2@16px.png b/src/main/webapp/images/workplace/Menu2@16px.png new file mode 100644 index 0000000..d21c7b8 Binary files /dev/null and b/src/main/webapp/images/workplace/Menu2@16px.png differ diff --git a/src/main/webapp/images/workplace/Menu@16px.png b/src/main/webapp/images/workplace/Menu@16px.png new file mode 100644 index 0000000..0ac016f Binary files /dev/null and b/src/main/webapp/images/workplace/Menu@16px.png differ diff --git a/src/main/webapp/images/workplace/Menue@16px.png b/src/main/webapp/images/workplace/Menue@16px.png new file mode 100644 index 0000000..0ac016f Binary files /dev/null and b/src/main/webapp/images/workplace/Menue@16px.png differ diff --git a/src/main/webapp/images/workplace/Menue@16pxgrau.png b/src/main/webapp/images/workplace/Menue@16pxgrau.png new file mode 100644 index 0000000..6e2b56d Binary files /dev/null and b/src/main/webapp/images/workplace/Menue@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Menue@32px.png b/src/main/webapp/images/workplace/Menue@32px.png new file mode 100644 index 0000000..ad798e0 Binary files /dev/null and b/src/main/webapp/images/workplace/Menue@32px.png differ diff --git a/src/main/webapp/images/workplace/Menue@32pxgrau.png b/src/main/webapp/images/workplace/Menue@32pxgrau.png new file mode 100644 index 0000000..c6af9f3 Binary files /dev/null and b/src/main/webapp/images/workplace/Menue@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Pfeil_Vorwaerts@16px.png b/src/main/webapp/images/workplace/Pfeil_Vorwaerts@16px.png new file mode 100644 index 0000000..4a0c876 Binary files /dev/null and b/src/main/webapp/images/workplace/Pfeil_Vorwaerts@16px.png differ diff --git a/src/main/webapp/images/workplace/Pfeil_Vorwaerts@16pxgrau.png b/src/main/webapp/images/workplace/Pfeil_Vorwaerts@16pxgrau.png new file mode 100644 index 0000000..78069de Binary files /dev/null and b/src/main/webapp/images/workplace/Pfeil_Vorwaerts@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Pfeil_Vorwaerts@32px.png b/src/main/webapp/images/workplace/Pfeil_Vorwaerts@32px.png new file mode 100644 index 0000000..7d2a3b1 Binary files /dev/null and b/src/main/webapp/images/workplace/Pfeil_Vorwaerts@32px.png differ diff --git a/src/main/webapp/images/workplace/Pfeil_Vorwaerts@32pxgrau.png b/src/main/webapp/images/workplace/Pfeil_Vorwaerts@32pxgrau.png new file mode 100644 index 0000000..9c4e530 Binary files /dev/null and b/src/main/webapp/images/workplace/Pfeil_Vorwaerts@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Pfeil_Zurueck@16px.png b/src/main/webapp/images/workplace/Pfeil_Zurueck@16px.png new file mode 100644 index 0000000..d0bbfb0 Binary files /dev/null and b/src/main/webapp/images/workplace/Pfeil_Zurueck@16px.png differ diff --git a/src/main/webapp/images/workplace/Pfeil_Zurueck@16pxgrau.png b/src/main/webapp/images/workplace/Pfeil_Zurueck@16pxgrau.png new file mode 100644 index 0000000..9940327 Binary files /dev/null and b/src/main/webapp/images/workplace/Pfeil_Zurueck@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Pfeil_Zurueck@32px.png b/src/main/webapp/images/workplace/Pfeil_Zurueck@32px.png new file mode 100644 index 0000000..27fb027 Binary files /dev/null and b/src/main/webapp/images/workplace/Pfeil_Zurueck@32px.png differ diff --git a/src/main/webapp/images/workplace/Pfeil_Zurueck@32pxgrau.png b/src/main/webapp/images/workplace/Pfeil_Zurueck@32pxgrau.png new file mode 100644 index 0000000..18e2f72 Binary files /dev/null and b/src/main/webapp/images/workplace/Pfeil_Zurueck@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Road@16px.png b/src/main/webapp/images/workplace/Road@16px.png new file mode 100644 index 0000000..276d97e Binary files /dev/null and b/src/main/webapp/images/workplace/Road@16px.png differ diff --git a/src/main/webapp/images/workplace/Road@16pxgrau.png b/src/main/webapp/images/workplace/Road@16pxgrau.png new file mode 100644 index 0000000..164d9a6 Binary files /dev/null and b/src/main/webapp/images/workplace/Road@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Road@32px.png b/src/main/webapp/images/workplace/Road@32px.png new file mode 100644 index 0000000..b1ba99c Binary files /dev/null and b/src/main/webapp/images/workplace/Road@32px.png differ diff --git a/src/main/webapp/images/workplace/Road@32pxgrau.png b/src/main/webapp/images/workplace/Road@32pxgrau.png new file mode 100644 index 0000000..e8a7e58 Binary files /dev/null and b/src/main/webapp/images/workplace/Road@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Speichern@16px.png b/src/main/webapp/images/workplace/Speichern@16px.png new file mode 100644 index 0000000..96f572e Binary files /dev/null and b/src/main/webapp/images/workplace/Speichern@16px.png differ diff --git a/src/main/webapp/images/workplace/Speichern@16pxgrau.png b/src/main/webapp/images/workplace/Speichern@16pxgrau.png new file mode 100644 index 0000000..e3b43ed Binary files /dev/null and b/src/main/webapp/images/workplace/Speichern@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Speichern@32px.png b/src/main/webapp/images/workplace/Speichern@32px.png new file mode 100644 index 0000000..7430bd2 Binary files /dev/null and b/src/main/webapp/images/workplace/Speichern@32px.png differ diff --git a/src/main/webapp/images/workplace/Speichern@32pxgrau.png b/src/main/webapp/images/workplace/Speichern@32pxgrau.png new file mode 100644 index 0000000..985df21 Binary files /dev/null and b/src/main/webapp/images/workplace/Speichern@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Support@16px.png b/src/main/webapp/images/workplace/Support@16px.png new file mode 100644 index 0000000..f6ec12c Binary files /dev/null and b/src/main/webapp/images/workplace/Support@16px.png differ diff --git a/src/main/webapp/images/workplace/Support@16pxgrau.png b/src/main/webapp/images/workplace/Support@16pxgrau.png new file mode 100644 index 0000000..9d5488e Binary files /dev/null and b/src/main/webapp/images/workplace/Support@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Support@32px.png b/src/main/webapp/images/workplace/Support@32px.png new file mode 100644 index 0000000..1d63aa0 Binary files /dev/null and b/src/main/webapp/images/workplace/Support@32px.png differ diff --git a/src/main/webapp/images/workplace/Support@32pxgrau.png b/src/main/webapp/images/workplace/Support@32pxgrau.png new file mode 100644 index 0000000..bfffd66 Binary files /dev/null and b/src/main/webapp/images/workplace/Support@32pxgrau.png differ diff --git a/src/main/webapp/images/workplace/Upload@16pxgrau.png b/src/main/webapp/images/workplace/Upload@16pxgrau.png new file mode 100644 index 0000000..3cb3f52 Binary files /dev/null and b/src/main/webapp/images/workplace/Upload@16pxgrau.png differ diff --git a/src/main/webapp/images/workplace/key-solid_grey.png b/src/main/webapp/images/workplace/key-solid_grey.png new file mode 100644 index 0000000..4bce585 Binary files /dev/null and b/src/main/webapp/images/workplace/key-solid_grey.png differ diff --git a/src/main/webapp/images/workplace/key-solid_red.png b/src/main/webapp/images/workplace/key-solid_red.png new file mode 100644 index 0000000..6771878 Binary files /dev/null and b/src/main/webapp/images/workplace/key-solid_red.png differ diff --git a/src/main/webapp/images/workplace/langgut.png b/src/main/webapp/images/workplace/langgut.png new file mode 100644 index 0000000..e5d11ed Binary files /dev/null and b/src/main/webapp/images/workplace/langgut.png differ diff --git a/src/main/webapp/images/workplace/menu16blau.png b/src/main/webapp/images/workplace/menu16blau.png new file mode 100644 index 0000000..ffeadef Binary files /dev/null and b/src/main/webapp/images/workplace/menu16blau.png differ diff --git a/src/main/webapp/images/workplace/menu16blau2.png b/src/main/webapp/images/workplace/menu16blau2.png new file mode 100644 index 0000000..53e77ca Binary files /dev/null and b/src/main/webapp/images/workplace/menu16blau2.png differ diff --git a/src/main/webapp/images/workplace/timocom.jpg b/src/main/webapp/images/workplace/timocom.jpg new file mode 100644 index 0000000..d16483e Binary files /dev/null and b/src/main/webapp/images/workplace/timocom.jpg differ diff --git a/src/main/webapp/images/workplace/warenkorbblau.png b/src/main/webapp/images/workplace/warenkorbblau.png new file mode 100644 index 0000000..049e08a Binary files /dev/null and b/src/main/webapp/images/workplace/warenkorbblau.png differ diff --git a/src/main/webapp/images/workplace/warenkorbblau40.png b/src/main/webapp/images/workplace/warenkorbblau40.png new file mode 100644 index 0000000..2e7d5b8 Binary files /dev/null and b/src/main/webapp/images/workplace/warenkorbblau40.png differ diff --git a/src/main/webapp/images/workplace/warenkorbblau45.png b/src/main/webapp/images/workplace/warenkorbblau45.png new file mode 100644 index 0000000..ac59891 Binary files /dev/null and b/src/main/webapp/images/workplace/warenkorbblau45.png differ diff --git a/src/main/webapp/images/workplace/warenkorbred30.png b/src/main/webapp/images/workplace/warenkorbred30.png new file mode 100644 index 0000000..da0d5c1 Binary files /dev/null and b/src/main/webapp/images/workplace/warenkorbred30.png differ diff --git a/src/main/webapp/images/workplace/warenkorbwhite.png b/src/main/webapp/images/workplace/warenkorbwhite.png new file mode 100644 index 0000000..1beae68 Binary files /dev/null and b/src/main/webapp/images/workplace/warenkorbwhite.png differ diff --git a/src/main/webapp/images/workplace/warenkorbwhite30.png b/src/main/webapp/images/workplace/warenkorbwhite30.png new file mode 100644 index 0000000..dc6a491 Binary files /dev/null and b/src/main/webapp/images/workplace/warenkorbwhite30.png differ diff --git a/src/main/webapp/main.xml b/src/main/webapp/main.xml index 28af6e7..9a9b528 100644 --- a/src/main/webapp/main.xml +++ b/src/main/webapp/main.xml @@ -2,7 +2,6 @@ - - + \ No newline at end of file diff --git a/src/main/webapp/workplace/defaultWorkplace.xml b/src/main/webapp/workplace/defaultWorkplace.xml index 9bbbf66..cb42272 100644 --- a/src/main/webapp/workplace/defaultWorkplace.xml +++ b/src/main/webapp/workplace/defaultWorkplace.xml @@ -6,8 +6,9 @@ - - + + + @@ -15,6 +16,9 @@ + + + diff --git a/src/main/webapp/workplace/menuPage.xml b/src/main/webapp/workplace/menuPage.xml new file mode 100644 index 0000000..bbf258b --- /dev/null +++ b/src/main/webapp/workplace/menuPage.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file