diff --git a/bin/css/buttons.css b/bin/css/buttons.css
index c6a4eefc0a19e40b14fa46eacaf239f6bac02b9b..262989098aad9a3d762b61d4dd2b90bd3186dc5f 100644
--- a/bin/css/buttons.css
+++ b/bin/css/buttons.css
@@ -36,7 +36,7 @@ button > .fa,
button.loading > .fa,
.btn.loading > .fa {
- margin-right: .75rem;
+ margin-right: 0;
}
/*****************************/
diff --git a/bin/css/order.css b/bin/css/order.css
index f8f179ed1b761f67e4db0001afa8935c57914d00..37ec6fd5a2dc11a07db03fac0d24e8e03b313e2b 100644
--- a/bin/css/order.css
+++ b/bin/css/order.css
@@ -22,6 +22,10 @@
cursor: pointer;
}
+.quiqqer-order-ordering-timeline li {
+ cursor: pointer;
+}
+
@media screen and (max-width: 767px) {
.quiqqer-order-ordering .quiqqer-order-ordering-timeline li {
width: 140px !important;
@@ -381,6 +385,7 @@ input.quiqqer-coupons-couponcodeinput-input:active {
.quiqqer-order-step-shipping-list-entry-price {
display: flex;
+ white-space: nowrap;
}
@media (max-width: 768px) {
diff --git a/bin/css/style.css b/bin/css/style.css
index 88b6efe18506f27e5410ec0802015a7ac1306fe7..f23e9c32e9c374ff5a69067732587701011765d4 100644
--- a/bin/css/style.css
+++ b/bin/css/style.css
@@ -1823,3 +1823,10 @@ table tr:last-child th {
margin-bottom: 1rem;
}
}
+
+/***********/
+/* Contact */
+/***********/
+.quiqqer-simple-contact textarea {
+ min-height: 160px;
+}
\ No newline at end of file
diff --git a/bin/media/acme-logo.svg b/bin/media/acme-logo.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f5b324fecac058665594ee880c13ed2b433829ff
--- /dev/null
+++ b/bin/media/acme-logo.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="300"
+ height="100"
+ viewBox="0 0 300 100"
+ version="1.1"
+ id="svg16"
+ sodipodi:docname="acme-logo-8_black.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ <metadata
+ id="metadata20">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>logo 8</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1007"
+ id="namedview18"
+ showgrid="false"
+ inkscape:zoom="1"
+ inkscape:cx="52.128379"
+ inkscape:cy="14.187094"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg16" />
+ <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+ <title
+ id="title2">logo 8</title>
+ <desc
+ id="desc4">Created with Sketch.</desc>
+ <defs
+ id="defs6" />
+ <g
+ id="Page-1"
+ transform="matrix(2.0325472,0,0,2.0325472,-0.20296257,-0.982744)"
+ style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ <g
+ id="Desktop-HD"
+ transform="translate(-1112,-925)"
+ style="fill:#313048">
+ <g
+ id="logo-8"
+ transform="translate(1112,925)">
+ <path
+ d="M 11.202343,35.884859 16.614117,30.425 h 10.994585 l 4.215905,14.930986 z M 3.6285132,16.946831 13.684136,18.237676 V 28.99331 c 0,0.104225 0.01187,0.206338 0.03281,0.304225 L 8.9292868,34.127113 Z M 13.684136,15.350352 4.6666075,14.192606 13.684136,5.096831 Z M 33.496589,8.2954225 25.153438,16.823591 16.523362,15.715141 V 3.6538732 Z M 16.523362,27.560915 v -8.95845 l 8.038774,1.032394 2.238151,7.926056 z m 23.699547,0 H 29.752607 l -2.489471,-8.816197 8.308245,-8.492957 z M 34.296626,43.653873 30.561023,30.425 h 9.310735 z M 43.448891,28.618662 37.696438,7.2102113 C 37.564494,6.7193662 37.184023,6.3355634 36.697438,6.2024648 L 15.474796,0.39964789 c -0.426547,-0.11690141 -0.883113,-0.0260563 -1.233566,0.24507042 -0.02374,0.0176056 -0.04398,0.0380282 -0.06632,0.0570422 L 14.09951,0.62640841 0.61266115,14.232042 l 0.001396,0.0014 c -0.0293208,0.02958 -0.0586415,0.05845 -0.0858679,0.09084 -0.30996226,0.373239 -0.41118868,0.880281 -0.26737736,1.345774 L 6.6632113,36.422183 c 0.1207736,0.389437 0.3993208,0.708451 0.7672264,0.877465 L 33.442834,49.246831 c 0.18849,0.08662 0.388849,0.128873 0.587811,0.128873 0.333698,0 0.663906,-0.119014 0.926397,-0.347183 0.168943,-0.145774 0.294603,-0.327465 0.378377,-0.526056 l 0.0021,0.0014 7.844698,-18.612676 c 0.0077,-0.0099 0.01675,-0.01831 0.02374,-0.02817 0.268774,-0.354225 0.358132,-0.814084 0.242944,-1.244366 z"
+ id="Fill-96"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 66.640002,20.481972 -2.351943,6.547887 h 4.704584 z m 4.162151,11.978873 -0.927793,-2.578873 h -6.468717 l -0.950132,2.578873 h -3.664396 l 5.835528,-15.219014 h 4.026717 l 5.812491,15.219014 z"
+ id="Fill-97"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 83.422643,24.862746 c 0,-4.677464 3.505925,-7.871831 8.029699,-7.871831 3.324415,0 5.247018,1.825353 6.310245,3.719015 l -2.759642,1.369014 c -0.633188,-1.231691 -1.990321,-2.213381 -3.550603,-2.213381 -2.737302,0 -4.727623,2.122536 -4.727623,4.997183 0,2.874648 1.990321,4.996479 4.727623,4.996479 1.560282,0 2.917415,-0.957746 3.550603,-2.21338 l 2.759642,1.346479 c -1.085566,1.893662 -2.98583,3.742253 -6.310245,3.742253 -4.523774,0 -8.029699,-3.194366 -8.029699,-7.871831"
+ id="Fill-98"
+ inkscape:connector-curvature="0" />
+ <polygon
+ id="Fill-99"
+ points="111.94434,32.460493 108.73232,32.460493 108.73232,17.242183 113.23375,17.242183 116.89815,26.436549 120.56185,17.242183 125.08562,17.242183 125.08562,32.460493 121.85126,32.460493 121.85126,21.804859 117.59906,32.460493 116.19655,32.460493 111.94434,21.804859 " />
+ <polygon
+ id="Fill-100"
+ points="140.33039,23.311197 147.63614,23.311197 147.63614,26.16331 140.33039,26.16331 140.33039,29.60838 147.79461,29.60838 147.79461,32.460493 137.11837,32.460493 137.11837,17.242183 147.79461,17.242183 147.79461,20.093591 140.33039,20.093591 " />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/bin/media/category/category-main.jpg b/bin/media/category/category-main.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..22404d82eabde1b7d963e6e040ffeb3369e4ec08
Binary files /dev/null and b/bin/media/category/category-main.jpg differ
diff --git a/demodata.xml b/demodata.xml
new file mode 100644
index 0000000000000000000000000000000000000000..66d586bb7dd90ae053e934c5abb9759bee2a1157
--- /dev/null
+++ b/demodata.xml
@@ -0,0 +1,525 @@
+<data>
+ <project>
+
+ <!-- SETTINGS -->
+ <settings>
+
+ <!-- general settings -->
+ <setting name="logo" value="${media:logo}"/>
+ <setting name="template" value="quiqqer/template-cologne"/>
+ <setting name="layout" value="layout/noSidebar"/>
+
+ <!-- template settings: general -->
+ <setting name="templateCologne.settings.homeLink" value="1"/>
+ <setting name="templateCologne.settings.homeLinkText" value="<![CDATA[{\"de\":\"Home\"}]]>"/>
+
+ <!-- template settings: ecommerce -->
+ <setting name="templateCologne.settings.showRetailPrice" value="1"/>
+ <setting name="templateCologne.settings.basketStyle" value="compact"/>
+ <setting name="templateCologne.settings.basketOpen" value="1"/>
+ <setting name="templateCologne.settings.hideEmptyFields" value="1"/>
+ <setting name="templateCologne.settings.showBuyNowButton" value="0"/>
+ <setting name="templateCologne.settings.showStock" value="1"/>
+ <setting name="templateCologne.settings.showStock" value="1"/>
+ <setting name="templateCologne.settings.categoryShowStock" value="0"/>
+ <setting name="templateCologne.settings.showVisitedProducts" value="1"/>
+ <setting name="templateCologne.settings.showEquipment" value="hide"/>
+ <setting name="templateCologne.settings.showSimilarProducts" value="afterDesc"/>
+
+ <!-- template settings: header -->
+ <setting name="templateCologne.settings.headerStartPage" value="hide"/>
+ <setting name="templateCologne.settings.headerNoSidebar" value="beforeContent"/>
+ <setting name="templateCologne.settings.headerNoSidebarThin" value="beforeContent"/>
+ <setting name="templateCologne.settings.headerLeftSidebar" value="beforeContent"/>
+ <setting name="templateCologne.settings.headerRightSidebar" value="beforeContent"/>
+ <setting name="templateCologne.settings.headerHeight" value="250"/>
+ <setting name="templateCologne.settings.headerImagePosition" value="center"/>
+
+ <!-- template settings: page title -->
+ <setting name="templateCologne.settings.pageTitleStartPage" value="breadcrumb"/>
+ <setting name="templateCologne.settings.pageTitleNoSidebar" value="breadcrumb"/>
+ <setting name="templateCologne.settings.pageTitleNoSidebarThin" value="breadcrumb"/>
+ <setting name="templateCologne.settings.pageTitleLeftSidebar" value="breadcrumb"/>
+ <setting name="templateCologne.settings.pageTitleRightSidebar" value="breadcrumb"/>
+
+ <setting name="templateCologne.settings.showCategoryMenu" value="1"/>
+ <setting name="templateCologne.settings.showCategoryShortFor" value="all"/>
+ <setting name="templateCologne.settings.showBasketButton" value=""/>
+
+ <!-- template settings: breadcrumb -->
+ <setting name="templateCologne.settings.showBreadcrumbStartPage" value=""/>
+ <setting name="templateCologne.settings.showBreadcrumbNoSidebar" value="1"/>
+ <setting name="templateCologne.settings.showBreadcrumbNoSidebarThin" value="1"/>
+ <setting name="templateCologne.settings.showBreadcrumbLeftSidebar" value="1"/>
+ <setting name="templateCologne.settings.showBreadcrumbRightSidebar" value="1"/>
+
+ <!-- template settings: predefined footer -->
+ <setting name="templateCologne.settings.predefinedFooter.shortText.title" value="<![CDATA[{\"de\":\"Ãœber uns\"}]]>"/>
+ <setting name="templateCologne.settings.predefinedFooter.payments" value="0"/>
+ <setting name="templateCologne.settings.predefinedFooter.payments.layout" value="grid"/>
+ <setting name="templateCologne.settings.predefinedFooter.urlList" value="1"/>
+ <setting name="templateCologne.settings.predefinedFooter.urlList.title" value="<![CDATA[{\"de\":\"Informationen\"}]]>"/>
+ <setting name="templateCologne.settings.predefinedFooter.urlList.sites" value=""/>
+ <setting name="templateCologne.settings.predefinedFooter.urlList.sites.order" value=""/>
+ <setting name="templateCologne.settings.predefinedFooter.urlList.sites.showStandardSites" value="1"/>
+ <setting name="templateCologne.settings.predefinedFooter.featuredProducts" value="1"/>
+ <setting name="templateCologne.settings.predefinedFooter.featuredProducts.title" value="<![CDATA[{\"de\":\"Neueste Produkte\"}]]>"/>
+ <setting name="templateCologne.settings.predefinedFooter.featuredProducts.category" value="0"/>
+ <setting name="templateCologne.settings.predefinedFooter.featuredProducts.order" value="c_date ASC"/>
+ <setting name="templateCologne.settings.predefinedFooter.shortText" value="1"/>
+ </settings>
+
+ <!-- SITES -->
+ <sites>
+ <!-- home -->
+ <site identifier="home">
+ <attributes>
+ <attribute name="name">Home</attribute>
+ <attribute name="title">Acme Company Ltd.</attribute>
+ <attribute name="short">Something big is happening here. Discover a new, great project.</attribute>
+ <attribute name="type">standard</attribute>
+ <attribute name="layout">layout/startPage</attribute>
+<!-- <attribute name="image_emotion">${media:pageBackground}</attribute>-->
+ <attribute name="content">
+ <![CDATA[]]>
+ </attribute>
+ </attributes>
+ <children>
+
+ <!-- home/products -->
+ <site identifier="products">
+ <attributes>
+ <attribute name="name">Produkte</attribute>
+ <attribute name="title">Produkte</attribute>
+ <attribute name="type">quiqqer/products:types/category</attribute>
+ <attribute name="layout">layout/noSidebar</attribute>
+ <attribute name="content">
+ <![CDATA[
+ <h2>Lassen Sie sich inspierieren</h2>
+ <p>Etiam sit amet orci eget eros faucibus tincidunt. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede.</p>
+ ]]>
+ </attribute>
+ <attribute name="extra">
+ <![CDATA["quiqqer.megamenu.settings.type":"Standard","quiqqer.products.settings.categoryId":"0","quiqqer.products.settings.showFilterLeft":1,"quiqqer.products.settings.showFreeTextSearch":1,"quiqqer.products.settings.productLoadNumber":"12","quiqqer.products.settings.showCategories":"1","quiqqer.products.settings.categoryDisplay":"gallery"]]>
+ </attribute>
+ </attributes>
+ </site>
+
+ <!-- home/contact -->
+ <site identifier="contact">
+ <attributes>
+ <attribute name="name">Kontakt</attribute>
+ <attribute name="title">Kontakt</attribute>
+ <attribute name="short">Donec interdum, metus et hendrerit aliquet, dolor diam sagittis ligula, eget egestas libero turpis vel mi. Praesent nec nisl a purus blandit viverra. Duis arcu tortor.</attribute>
+ <attribute name="type">quiqqer/sitetypes:types/contact</attribute>
+ <attribute name="layout">layout/noSidebarSlim</attribute>
+ <attribute name="content"><![CDATA[
+ <p>Haben Sie Fragen, Anregungen oder möchten Sie uns einfach eine nette Nachricht schicken? Kein Problem! Benutzen Sie den unten stehenden Kontaktformular oder setzen Sie sich mit uns in direkter Verbindungn. Nutzen Sie dazu unsere Telefonnumer oder E-Mail Adresse.</p>
+
+ <p> </p>
+
+ <p><strong>ACME Company GmbH</strong><br />
+ Beispiel Str. 146<br />
+ 43210 Berlin</p>
+
+ <p><span class="fa fa-phone"> </span> <a href="tel:+492122263078">49 (0)212 - 226 30 78</a><br />
+ <span class="fa fa-fax"> </span> <a href="tel:+492122263079">49 (0)212 - 226 30 79</a><br />
+ <span class="fa fa-envelope-o"> </span> <a href="support@acme-domain.com">support@acme-domain.com</a></p>
+
+ <p> </p>
+ ]]></attribute>
+ </attributes>
+ </site>
+
+ <!-- home/Legal-notice -->
+ <site identifier="legal">
+ <attributes>
+ <attribute name="name">Legal-notice</attribute>
+ <attribute name="title">Legal notice</attribute>
+ <attribute name="short">Vivamus in erat ut urna cursus vestibulum. Donec vitae orci sed dolor rutrum auctor. Phasellus volutpat, metus eget egestas mollis, lacus lacus blandit dui, id egestas quam mauris ut lacus.</attribute>
+ <attribute name="type">quiqqer/sitetypes:types/legalnotes</attribute>
+ <attribute name="layout">layout/noSidebar</attribute>
+ <attribute name="content"><![CDATA[
+ <h1>Nulla sit amet ccurabitur a felis in nunc</h1>
+ <p>Proin viverra, ligula sit amet ultrices semper, ligula arcu tristique sapien, a accumsan nisi mauris ac eros. Fusce vel dui. Aenean massa. Nulla neque dolor, sagittis eget, iaculis quis, molestie non, velit. In hac habitasse platea dictumst.</p>
+
+ <p>Vivamus laoreet. In hac habitasse platea dictumst. Fusce pharetra convallis urna. Duis leo. Quisque id mi.</p>
+
+ <h2>Etiam iaculis nunc ac metus</h2>
+
+ <p>Sed fringilla mauris sit amet nibh. Aenean commodo ligula eget dolor. Ut id nisl quis enim dignissim sagittis. Fusce fermentum. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum.</p>
+
+ <p>Fusce fermentum odio nec arcu. Aliquam erat volutpat. Cras varius. Donec interdum, metus et hendrerit aliquet, dolor diam sagittis ligula, eget egestas libero turpis vel mi. Proin magna.</p>
+
+ <p>Curabitur ullamcorper ultricies nisi. Duis lobortis massa imperdiet quam. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Vivamus euismod mauris.</p>
+ ]]></attribute>
+ </attributes>
+ </site>
+
+ <!-- home/Privacy -->
+ <site identifier="privacy">
+ <attributes>
+ <attribute name="name">Privacy-policy</attribute>
+ <attribute name="title">Privacy policy</attribute>
+ <attribute name="short">Curabitur a felis in nunc fringilla tristique.</attribute>
+ <attribute name="type">quiqqer/sitetypes:types/privacypolicy</attribute>
+ <attribute name="layout">layout/noSidebar</attribute>
+ <attribute name="content"><![CDATA[
+ <h2>Fusce fermentum odio nec arcu</h2>
+ <p>Vestibulum turpis sem, aliquet eget, lobortis pellentesque, rutrum eu, nisl. Pellentesque commodo eros a enim. Vestibulum dapibus nunc ac augue. Praesent nonummy mi in odio. Nam adipiscing.</p>
+ <p>Vestibulum rutrum, mi nec elementum vehicula, eros quam gravida nisl, id fringilla neque ante vel mi. Nullam tincidunt adipiscing enim. Donec mi odio, faucibus at, scelerisque quis, convallis in, nisi. In ut quam vitae odio lacinia tincidunt. Ut leo.</p>
+ <p>Aliquam eu nunc. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Fusce fermentum odio nec arcu. Praesent adipiscing. Ut id nisl quis enim dignissim sagittis.</p>
+ <p>Donec orci lectus, aliquam ut, faucibus non, euismod id, nulla. Etiam feugiat lorem non metus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Fusce vulputate eleifend sapien. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
+ <p>Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Praesent egestas tristique nibh. Curabitur suscipit suscipit tellus. Fusce egestas elit eget lorem.</p>
+
+ <h2>Sed fringilla mauris sit amet nibh vestibulum aliquam leo.</h2>
+ <p>Fusce fermentum. Suspendisse enim turpis, dictum sed, iaculis a, condimentum nec, nisi. Pellentesque auctor neque nec urna. Cras varius. Cras non dolor.</p>
+ <p>Nullam sagittis. Vestibulum rutrum, mi nec elementum vehicula, eros quam gravida nisl, id fringilla neque ante vel mi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Quisque rutrum.</p>
+ <p>Duis leo. Cras dapibus. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Vestibulum rutrum, mi nec elementum vehicula, eros quam gravida nisl, id fringilla neque ante vel mi. Aenean ut eros et nisl sagittis vestibulum.</p>
+
+ <h2>Aenean commodo ligula eget dolor</h2>
+ <p>Fusce vel dui. Curabitur a felis in nunc fringilla tristique. Praesent vestibulum dapibus nibh. Phasellus magna. Maecenas nec odio et ante tincidunt tempus.</p>
+ ]]></attribute>
+ </attributes>
+
+ </site>
+
+ <!-- home/General-terms-and-conditions -->
+ <site identifier="terms">
+ <attributes>
+ <attribute name="name">ABG</attribute>
+ <attribute name="title">General terms and conditions</attribute>
+ <attribute name="short">Praesent congue erat at massa. Vestibulum fringilla pede sit amet augue. Donec orci lectus, aliquam ut, faucibus non, euismod id, nulla. Praesent nec nisl a purus blandit viverra.</attribute>
+ <attribute name="type">quiqqer/sitetypes:types/generalTermsAndConditions</attribute>
+ <attribute name="layout">layout/noSidebar</attribute>
+ <attribute name="active">0</attribute>
+ <attribute name="content"><![CDATA[
+ <h2>Curabitur at lacus ac velit</h2>
+ <p>Phasellus volutpat, metus eget egestas mollis, lacus lacus blandit dui, id egestas quam mauris ut lacus. Fusce commodo aliquam arcu. Donec mi odio, faucibus at, scelerisque quis, convallis in, nisi. Proin pretium, leo ac pellentesque mollis, felis nunc ultrices eros, sed gravida augue augue mollis justo. Sed aliquam ultrices mauris.</p>
+
+ <h2>Sed fringilla mauris sit amet nibh vestibulum aliquam leo.</h2>
+ <p>Fusce fermentum. Suspendisse enim turpis, dictum sed, iaculis a, condimentum nec, nisi. Pellentesque auctor neque nec urna. Cras varius. Cras non dolor.</p>
+ <p>Nullam sagittis. Vestibulum rutrum, mi nec elementum vehicula, eros quam gravida nisl, id fringilla neque ante vel mi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Quisque rutrum.</p>
+
+ <h2>Fusce fermentum odio nec arcu</h2>
+ <p>Duis leo. Cras dapibus. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Vestibulum rutrum, mi nec elementum vehicula, eros quam gravida nisl, id fringilla neque ante vel mi. Aenean ut eros et nisl sagittis vestibulum.</p>
+
+ <h2>Aenean commodo ligula eget dolor</h2>
+ <p>Fusce vel dui. Curabitur a felis in nunc fringilla tristique. Praesent vestibulum dapibus nibh. Phasellus magna. Maecenas nec odio et ante tincidunt tempus.</p>
+
+ ]]></attribute>
+ </attributes>
+ </site>
+ </children>
+ <bricks>
+ <area type="startpageHeader">
+ <brick identifier="brick.startpageHeader"></brick>
+ </area>
+ <area type="startpageContent">
+ </area>
+ <area type="footer">
+ <brick identifier="brick.footer.logoAndSocial">
+ <attributes>
+ <attribute name="settings">
+ <![CDATA[{"inheritance":true}]]>
+ </attribute>
+ </attributes>
+ </brick>
+ <brick identifier="brick.footer.aboutUs">
+ <attributes>
+ <attribute name="settings">
+ <![CDATA[{"inheritance":true}]]>
+ </attribute>
+ </attributes>
+ </brick>
+ <brick identifier="brick.footer.urlList">
+ <attributes>
+ <attribute name="settings">
+ <![CDATA[{"inheritance":true}]]>
+ </attribute>
+ </attributes>
+ </brick>
+ <brick identifier="brick.footer.contact">
+ <attributes>
+ <attribute name="settings">
+ <![CDATA[{"inheritance":true}]]>
+ </attribute>
+ </attributes>
+ </brick>
+ </area>
+ </bricks>
+ </site>
+ </sites>
+
+ <!-- MEDIA -->
+ <media>
+ <!-- general -->
+ <file path="acme-logo.svg" identifier="logo">
+ <name>acme-logo</name>
+ <description><![CDATA[{"de":"<p>ACME project logo.<\/p>\n"}]]></description>
+ <title><![CDATA[{"de":"ACME - QUIQQER eCommerce Demo"}]]></title>
+ <priority>0</priority>
+ <alt><![CDATA[{"de":"ACME - QUIQQER eCommerce Demo"}]]></alt>
+ </file>
+
+ <!-- categories -->
+ <file path="category/category-main.svg" identifier="categoryMain">
+ <name>category-main</name>
+ <description><![CDATA[{"de":"<p>A beautiful abstract wallpaper for a web page.<\/p>\n"}]]></description>
+ <title><![CDATA[{"de":"Main product category"}]]></title>
+ <priority>0</priority>
+ <alt><![CDATA[{"de":"Main product category"}]]></alt>
+ </file>
+
+ </media>
+ </project>
+ <bricks>
+ <brick identifier="brick.dummyContent">
+ <attributes>
+ <attribute name="title">Dummy content3</attribute>
+ <attribute name="type">content</attribute>
+ <attribute name="settings">
+ <![CDATA[{"width":"","height":"","classes":[],"brickFullWidth":false}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,startpageHeader,startpageContent,headerSuffix,footerPrefix,footer,]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[
+ <h1>Inhalt-Baustein</h1>
+
+ <p>Das ist nur ein Test. Mehr nicht.</p>
+ ]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ <!-- Your advantages -->
+ <brick identifier="brick.advantages">
+ <attributes>
+ <attribute name="title">Startseite  - Unsere Vorteile</attribute>
+ <attribute name="type">\QUI\Bricks\Controls\BoxContentAdvanced</attribute>
+ <attribute name="settings">
+ <![CDATA[{"classes":[],"width":"","height":"","template":"standard","centerText":true,"entriesPerLine":"3","entries":"[{\"entryTitle\":\"Einfach zum Managen\",\"entrySubTitle\":\"\",\"entryImage\":\"fa fa-area-chart\",\"entryUrl\":\"\",\"entryOrder\":\"\",\"entryContent\":\"<p>Etiam imperdiet imperdiet orci. Sed fringilla mauris sit amet nibh. Vestibulum fringilla pede sit amet augue. Proin faucibus arcu quis ante. Maecenas malesuada.<\/p>\\n\"},{\"entryTitle\":\"Sparen Sie Zeit\",\"entrySubTitle\":\"\",\"entryImage\":\"fa fa-clock-o\",\"entryUrl\":\"\",\"entryOrder\":\"\",\"entryContent\":\"<p>Cras id dui. Suspendisse feugiat. Phasellus accumsan cursus velit. Pellentesque libero tortor, tincidunt et, tincidunt eget, semper nec, quam. Pellentesque commodo eros a enim.<\/p>\\n\"},{\"entryTitle\":\"Entdecken Sie neues\",\"entrySubTitle\":\"\",\"entryImage\":\"fa fa-map-o\",\"entryUrl\":\"\",\"entryOrder\":\"\",\"entryContent\":\"<p>Maecenas malesuada. Phasellus dolor. Aenean vulputate eleifend tellus. Curabitur at lacus ac velit ornare lobortis. Curabitur nisi.<\/p>\\n\"}]","brickFullWidth":false,"navText":"Ihre Vorteile","navTarget":""}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,startpageContent,]]>
+ </attribute>
+ <attribute name="classes">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ <!-- Contact -->
+ <brick identifier="brick.contact">
+ <attributes>
+ <attribute name="title">Startseite - Kontaktformular</attribute>
+ <attribute name="type">\QUI\Bricks\Controls\SimpleContact</attribute>
+ <attribute name="settings">
+ <![CDATA[{"classes":["max-w-full","mx-auto"],"width":"700","height":"","mailTo":"","showPrivacyPolicyCheckbox":true,"useCaptcha":false,"brickFullWidth":false,"navText":"Kontakt","navTarget":""}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,startpageContent,]]>
+ </attribute>
+ <attribute name="classes">
+ <![CDATA[["max-w-full","mx-auto"]]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[
+ <h2 style="text-align: center;">Kontaktieren Sie uns</h2>
+
+ <p style="text-align: center;">Etiam ultricies nisi vel augue. Nulla porta dolor. Duis lobortis massa imperdiet quam. Cras varius. Aliquam lobortis. Morbi vestibulum volutpat enim. Nunc nonummy metus.</p>
+ ]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ <!-- Google map -->
+ <brick identifier="brick.googleMap">
+ <attributes>
+ <attribute name="title">Startseite - Google Map</attribute>
+ <attribute name="type">\QUI\Bricks\Controls\SimpleGoogleMaps</attribute>
+ <attribute name="settings">
+ <![CDATA[{"classes":[],"width":"","height":"","preventLoadMap":true,"template":"standard","place":"","street":"","zip":"","city":"","zoom":"15","api":"","brickFullWidth":false,"navText":"Anfahrt","navTarget":""}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,startpageContent,]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ <brick identifier="brick.startpageHeader">
+ <attributes>
+ <attribute name="title">Startpage header</attribute>
+ <attribute name="type">\QUI\PresentationBricks\Controls\WallpaperText</attribute>
+ <attribute name="settings">
+ <![CDATA[{"classes":[],"width":"","height":"70vh","image-background":"${media:pageBackground}","image-background-fixed":false,"bg-color":"#f5f5f5","content-position":"flex-start","brickFullWidth":true,"navText":"Home","navTarget":false}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,startpageHeader,]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[
+ <h1>Fusce risus nisl, viverra et rempor et pret</h1>
+
+ <p>Fusce fermentum. Sed fringilla mauris sit amet nibh. Nullam tincidunt adipiscing enim. Proin faucibus arcu quis ante. Vivamus elementum semper nisi. Nullam cursus lacinia erat. Aenean massa. Nunc nec neque. Cras non dolor.</p>
+
+ <p><a class="btn btn-large" href="#">Kontakt <span class="fa fa-envelope-o"> </span></a></p>
+ ]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ <!-- Site listing -->
+ <brick identifier="brick.siteListing">
+ <attributes>
+ <attribute name="title">Seitenliste</attribute>
+ <attribute name="type">\QUI\Bricks\Controls\Children\Listing</attribute>
+ <attribute name="settings">
+ <![CDATA[{"classes":[],"width":"","height":"","site":"p${site:home}","order":"c_date DESC","template":"childrenList","max":"","showImages":true,"showShort":true,"showCreator":false,"showDate":false,"showTime":false,"showSheets":false,"brickFullWidth":false,"navText":"","navTarget":""}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,startpageContent,]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ <!-- Footer: logo & social -->
+ <brick identifier="brick.footer.logoAndSocial">
+ <attributes>
+ <attribute name="title">Footer - logo and social</attribute>
+ <attribute name="type">content</attribute>
+ <attribute name="settings">
+ <![CDATA[{"width":"","height":"","classes":[],"brickFullWidth":false,"navText":"","navTarget":""}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,footer,]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[
+ <p style="text-align: center; margin-bottom: 3rem;"><a href="/"><img src="${media:logo}" style="height: 50px; width: 150px;" /></a></p>
+ <p style="text-align: center; margin-bottom: 4rem;"><a href="http://www.facebook.com"><span class="fa fa-facebook" style="font-size: 1.125rem; width: 3rem; opacity: 0.5;"> </span> </a> <a href="http://www.twitter.com"> <span class="fa fa-twitter" style="font-size: 1.125rem; width: 3rem; opacity: 0.5;"> </span></a> <a href="http://www.instagram.com"> <span class="fa fa-instagram" style="font-size: 1.125rem; width: 3rem; opacity: 0.5;"> </span> </a></p>
+ ]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ <!-- Footer: about us -->
+ <brick identifier="brick.footer.aboutUs">
+ <attributes>
+ <attribute name="title">Footer - Ãœber uns</attribute>
+ <attribute name="type">content</attribute>
+ <attribute name="settings">
+ <![CDATA[{"width":"","height":"","classes":["grid-30","mobile-grid-100"],"brickFullWidth":false,"navText":"","navTarget":""}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,footer,]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[
+ <h2>ACME Company Ltd.</h2>
+
+ <p>
+ In consectetuer turpis ut velit. Ut tincidunt tincidunt erat. Vestibulum turpis sem, aliquet eget, lobortis pellentesque, rutrum eu, nisl.
+ </p>
+
+ ]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ <!-- Footer: url list -->
+ <brick identifier="brick.footer.urlList">
+ <attributes>
+ <attribute name="title">Footer - Support (url list)</attribute>
+ <attribute name="type">content</attribute>
+ <attribute name="settings">
+ <![CDATA[{"width":"","height":"","classes":["grid-30","mobile-grid-100"],"brickFullWidth":false,"navText":"","navTarget":""}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,footer,]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[
+ <h2>Support</h2>
+
+ <ul class="fa-ul">
+ <li><span class="fa-li fa fa-caret-right"> </span><a href="${siteurl:aboutUs}">Ãœber uns</a></li>
+ <li><span class="fa-li fa fa-caret-right"> </span><a href="${siteurl:gallery}">Galerie</a></li>
+ <li><span class="fa-li fa fa-caret-right"> </span><a href="${siteurl:contact}">Kontakt</a></li>
+ <li><span class="fa-li fa fa-caret-right"> </span><a href="#">Leistungen</a></li>
+ </ul>
+
+ ]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ <!-- Footer: contact -->
+ <brick identifier="brick.footer.contact">
+ <attributes>
+ <attribute name="title">Footer - Kontakt</attribute>
+ <attribute name="type">content</attribute>
+ <attribute name="settings">
+ <![CDATA[{"width":"","height":"","classes":["grid-30","mobile-grid-100"],"brickFullWidth":false,"navText":"","navTarget":""}]]>
+ </attribute>
+ <attribute name="customfields">
+ <![CDATA[]]>
+ </attribute>
+ <attribute name="areas">
+ <![CDATA[,footer,]]>
+ </attribute>
+ <attribute name="content">
+ <![CDATA[
+ <h2>Kontakt</h2>
+
+ <ul style="margin-left: 0; padding-left: 0; list-style: none;">
+ <li><span class="fa fa-phone"> </span> <a href=tel:+492122263078">49 (0)212 - 226 30 78</a></li>
+ <li><span class="fa fa-fax"> </span> <a href=tel:+492122263079">49 (0)212 - 226 30 79</a></li>
+ <li><span class="fa fa-envelope-o"> </span> <a href="support@acme-domain.com">support@acme-domain.com</a></li>
+ </ul>
+
+ ]]>
+ </attribute>
+ </attributes>
+ </brick>
+
+ </bricks>
+</data>
diff --git a/quiqqer/order/src/QUI/ERP/Order/Controls/Basket/Small.html b/quiqqer/order/src/QUI/ERP/Order/Controls/Basket/Small.html
index 5b104b4a36d19e9be7bda7c6a9c7c65d9c69b9f1..13da1b01ed47d02692f87d486410be8a703cfe2e 100644
--- a/quiqqer/order/src/QUI/ERP/Order/Controls/Basket/Small.html
+++ b/quiqqer/order/src/QUI/ERP/Order/Controls/Basket/Small.html
@@ -6,7 +6,7 @@
<div class="quiqqer-order-basket-small-articles-article" data-pos="{$pos}">
<div class="quiqqer-order-basket-small-articles-article-image">
- <img src="{$product.image}">
+ {image src=$product.imageSrc width=100}
</div>
<div class="quiqqer-order-basket-small-articles-article-content">
diff --git a/quiqqer/products/src/QUI/ERP/Products/Controls/Category/ProductListDetails.html b/quiqqer/products/src/QUI/ERP/Products/Controls/Category/ProductListDetails.html
index ccef951334307c62d5c54a8fefcb10c62cbc7c1e..3989ce0ed46aa5c75b2e9ff2b0ceaf48916610ce 100644
--- a/quiqqer/products/src/QUI/ERP/Products/Controls/Category/ProductListDetails.html
+++ b/quiqqer/products/src/QUI/ERP/Products/Controls/Category/ProductListDetails.html
@@ -1,7 +1,7 @@
<article class="cologne-productList-product-details" data-pid="{$Product->getId()}">
{$JsonLd->getJsonLd($Product)}
<div class="cologne-productList-product-details-image">
- <a href="{$Product->getUrl()}" title="{$Product->getTitle()|escape:" html"}">
+ <a href="{$Product->getUrl()}" title="{$Product->getTitle()|escape:'html'}">
{image image=$Product->getImage() title=$Product->getTitle() width=200}
</a>
</div>
diff --git a/src/QUI/TemplateCologne/Controls/Payments.php b/src/QUI/TemplateCologne/Controls/Payments.php
index 3ff9403e02233da7dda10187569efac9d4b70cc4..d9178e1078048696a0aeda0c69574533acf53eb2 100644
--- a/src/QUI/TemplateCologne/Controls/Payments.php
+++ b/src/QUI/TemplateCologne/Controls/Payments.php
@@ -47,6 +47,10 @@ public function __construct($attributes = [])
*/
public function getBody()
{
+ if (!\class_exists('\QUI\ERP\Accounting\Payments\Payments')) {
+ return '';
+ }
+
$Engine = QUI::getTemplateManager()->getEngine();
$Payments = \QUI\ERP\Accounting\Payments\Payments::getInstance();
$payments = $Payments->getpayments();
diff --git a/src/QUI/TemplateCologne/Controls/SimpleUserInfo.css b/src/QUI/TemplateCologne/Controls/SimpleUserInfo.css
index e47533c493b2b7b4389e7b53b2939a203bf36cd6..c5c40bc6a23a46bf778caead650d50bad3a99207 100644
--- a/src/QUI/TemplateCologne/Controls/SimpleUserInfo.css
+++ b/src/QUI/TemplateCologne/Controls/SimpleUserInfo.css
@@ -54,7 +54,10 @@
.sui-data-name {
display: block;
- font-size: 1.3em;
+ font-size: 1.25em;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.sui-data-joined {
@@ -84,7 +87,6 @@
margin-bottom: 1em;
padding: 0;
width: 100%;
-
}
.quiqqer-frontendUsers-controls-profile-categories > div {
diff --git a/src/QUI/TemplateCologne/Utils.php b/src/QUI/TemplateCologne/Utils.php
index 889ca05e7e81a61390f138db82e3c31ed45031ac..c6626364513f70b7de7f2fc4575a6ba64f6ffa1d 100644
--- a/src/QUI/TemplateCologne/Utils.php
+++ b/src/QUI/TemplateCologne/Utils.php
@@ -403,7 +403,8 @@ private static function getPredefinedFooter($Project)
/** Predefined footer: Payments Control */
$paymentsData = false;
- if ($Project->getConfig('templateCologne.settings.predefinedFooter.payments')) {
+ if ($Project->getConfig('templateCologne.settings.predefinedFooter.payments') &&
+ \class_exists('\QUI\ERP\Accounting\Payments\Payments')) {
$PaymentsControl = new \QUI\TemplateCologne\Controls\Payments([
'template' => $Project->getConfig('templateCologne.settings.predefinedFooter.payments.layout')
]);