diff --git a/ajax/getLangList.php b/ajax/getLangList.php
index 3c3a446f5e55daf7ad2eb331fcfeec4e3d7c03ad..5a795cdc42b6c9ac2b156fe130dbc5e770f3ccd4 100644
--- a/ajax/getLangList.php
+++ b/ajax/getLangList.php
@@ -13,8 +13,8 @@
'package_quiqqer_template-cologne_ajax_getLangList',
function ($flagFolderPath) {
- $Engine = QUI::getTemplateManager()->getEngine();
- $Site = QUI::getRewrite()->getSite();
+ $Engine = QUI::getTemplateManager()->getEngine();
+ $Site = QUI::getRewrite()->getSite();
$Project = $Site->getProject();
$langs = $Project->getLanguages();
@@ -30,7 +30,7 @@ function ($flagFolderPath) {
'path' => $flagFolderPath
]);
- return $Engine->fetch(dirname(__FILE__) . '/template/LangList.html');
+ return QUI\Output::getInstance()->parse($Engine->fetch(dirname(__FILE__) . '/template/LangList.html'));
},
['flagFolderPath']
);
diff --git a/ajax/template/LangList.html b/ajax/template/LangList.html
index 744011e05820bceeb352318147b4120252e417ba..90a6e9dae53c1c543c750f28b5fcf8c1de41fe02 100644
--- a/ajax/template/LangList.html
+++ b/ajax/template/LangList.html
@@ -12,7 +12,7 @@
<img src="{$path}{$lang}.png"/>
</span>
<span class="lcs-menu-list-entry-link-text ">
- {locale group="quiqqer/system" var="language.$lang"}
+ {locale group="quiqqer/quiqqer" var="language.$lang"}
</span>
</a>
diff --git a/bin/css/product-bricks.css b/bin/css/product-bricks.css
index 554b7344f71b036614336a17b3af9bb27347336c..9c525e06999448dc1ee1201f3cf094f9ea1c76ae 100644
--- a/bin/css/product-bricks.css
+++ b/bin/css/product-bricks.css
@@ -22,4 +22,16 @@
.quiqqer-products-control-product-childrenslider-entry .quiqqer-products-control-product-childrenslider-entry-price-regularPrice {
font-size: 1.2rem;
+}
+
+/**********************/
+/* Manufacture slider */
+/**********************/
+.quiqqer-bricks-children-slider-container-slide .quiqqer-product-bricks-control-manufactureSlider-entry {
+ box-shadow: 0 0 10px rgba(0,0,0,0);
+ transition: 0.2s all;
+}
+
+.quiqqer-bricks-children-slider-container-slide .quiqqer-product-bricks-control-manufactureSlider-entry:hover {
+ box-shadow: 0 0 10px rgba(0,0,0,.1);
}
\ No newline at end of file
diff --git a/bin/css/products.css b/bin/css/products.css
index 8cfef02f10791a60f2cfa600eb2e76807cb50c0e..a1cfd344e6abe11ebf151c5ee2b0243d52fbd502 100644
--- a/bin/css/products.css
+++ b/bin/css/products.css
@@ -196,15 +196,23 @@
/** Categories
============================================== */
/* categories: gallery */
-.cologne-products-categoryGallery-categories {
+/* manufacture list: gallery */
+.cologne-products-categoryGallery-categories,
+.quiqqer-products-manufacturerList-entries-container-real {
display: grid;
grid-gap: 20px;
grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
margin-bottom: 40px;
width: 100%;
+ background: #fff;
+}
+
+.quiqqer-products-manufacturerList-entries-container-real {
+ grid-template-columns: repeat(auto-fill, minmax(350px, 1fr));
}
-.cologne-products-categoryGallery-category {
+.cologne-products-categoryGallery-category,
+.cologne-products-manufacturerList-entry {
border: 1px solid #ddd;
box-shadow: 0 0 10px rgba(0, 0, 0, 0);
display: flex;
@@ -213,15 +221,18 @@
transition: 0.2s all;
}
-.cologne-products-categoryGallery-category:hover {
+.cologne-products-categoryGallery-category:hover,
+.cologne-products-manufacturerList-entry:hover {
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}
-.cologne-products-categoryGallery-category-image {
+.cologne-products-categoryGallery-category-image,
+.cologne-products-manufacturerList-entry-image {
height: 160px;
}
-.cologne-products-categoryGallery-category-image-link {
+.cologne-products-categoryGallery-category-image-link,
+.cologne-products-manufacturerList-entry-image-link {
color: inherit;
display: block;
font-size: 80px;
@@ -229,35 +240,45 @@
text-align: center;
}
-.cologne-products-categoryGallery-category-image-link-img {
+.cologne-products-categoryGallery-category-image-link img,
+.cologne-products-manufacturerList-entry-image-link img {
font-size: initial;
max-height: 100%;
}
-.cologne-products-categoryGallery-category-content {
+.cologne-products-categoryGallery-category-content,
+.cologne-products-manufacturerList-entry-content {
display: flex;
flex-direction: column;
flex-grow: 1;
margin-top: 1rem;
}
-.cologne-products-categoryGallery-category-content-header {
+.cologne-products-categoryGallery-category-content-header,
+.cologne-products-manufacturerList-entry-content-header {
text-align: center;
}
-.cologne-products-categoryGallery-category-content-header-title {
+.cologne-products-categoryGallery-category-content-header-title,
+.cologne-products-manufacturerList-entry-content-header-title {
font-size: 1.25rem;
}
-.cologne-products-categoryGallery-category-content-short {
+.cologne-products-categoryGallery-category-content-short,
+.cologne-products-manufacturerList-entry-content-short {
margin-bottom: 1em;
}
-.cologne-products-categoryGallery-category-content-buttonContainer {
+.cologne-products-categoryGallery-category-content-buttonContainer,
+.cologne-products-manufacturerList-entry-content-buttonContainer {
margin-top: auto;
text-align: center;
}
+.quiqqer-products-manufacturerList-entries-container {
+ margin-top: 1rem;
+}
+
/* categories: list */
.quiqqer-products-productList-categories__bottom > .quiqqer-products-productList-categories-header {
border-bottom: 1px solid #ddd;
diff --git a/bin/css/style.css b/bin/css/style.css
index 2c532610fb222544c740cb9c0c8cb11e135009a4..92975024a829cce8368b7e45c2ace55b6188a5d0 100644
--- a/bin/css/style.css
+++ b/bin/css/style.css
@@ -143,9 +143,9 @@ small, .font_small, .font-small {
}
img {
+ height: auto;
max-width: 100%;
width: auto;
- height: auto;
}
.html5tooltip-box {
@@ -746,15 +746,15 @@ a.toTop:before {
left: 0;
position: relative;
top: 0;
+ transition: 0.25s height;
width: 100%;
z-index: 99;
- transition: 0.25s height;
}
.cologne-header-fixed {
box-shadow: 0 0 20px 0 rgba(57, 57, 57, 0.2);
- position: fixed;
height: 60px;
+ position: fixed;
z-index: 100; /* Because of the search dropdown */
}
@@ -769,17 +769,17 @@ a.toTop:before {
}
.cologne-header-logo-link {
- height: 100%;
- display: flex;
align-items: center;
+ display: flex;
+ height: 100%;
padding: 10px 0;
}
.cologne-header-logo-link picture {
+ align-items: center;
+ display: flex;
height: 100%;
width: auto;
- display: flex;
- align-items: center;
}
.cologne-header-logo-link img {
@@ -967,6 +967,10 @@ a.toTop:before {
/** Mega Menu
===================================== */
+.cologne-header-nav .quiqqer-menu-megaMenu {
+ position: initial;
+}
+
.quiqqer-menu-megaMenu nav {
align-items: center;
display: flex;
@@ -1033,10 +1037,11 @@ a.toTop:before {
background: #fff;
border: 1px solid #e1e7ec;
box-shadow: 0 7px 22px -5px rgba(48, 60, 72, 0.2) !important;
+ left: 50% !important;
line-height: 1.5;
- max-width: 100% !important;
min-width: 200px;
text-align: left;
+ transform: translateX(-50%);
z-index: 100;
}
@@ -1776,4 +1781,29 @@ table tr:last-child th {
.qui-contextitem-container .qui-contextitem-text {
padding: 5px 0;
+}
+
+/***************/
+/* Search site */
+/***************/
+.qui-search-result form {
+ display: flex;
+}
+
+.qui-search-result form input[type="text"] {
+ flex-grow: 1;
+ width: 300px;
+ max-width: 100%;
+}
+
+@media screen and (max-width: 767px) {
+ .qui-search-result form {
+ flex-direction: column;
+ }
+
+ .qui-search-result form input[type="text"] {
+ width: initial;
+ margin-right: 0;
+ margin-bottom: 1rem;
+ }
}
\ No newline at end of file
diff --git a/quiqqer/products/src/QUI/ERP/Products/Controls/ManufacturerList/ManufacturerList.Gallery.html b/quiqqer/products/src/QUI/ERP/Products/Controls/ManufacturerList/ManufacturerList.Gallery.html
new file mode 100644
index 0000000000000000000000000000000000000000..dc0174ee1dc07735e5aac2fab12a242f7a25faeb
--- /dev/null
+++ b/quiqqer/products/src/QUI/ERP/Products/Controls/ManufacturerList/ManufacturerList.Gallery.html
@@ -0,0 +1,33 @@
+{foreach $manufacturerUsers as $userId}
+<article class="cologne-products-manufacturerList-entry"
+ data-mid="{$userId}"
+>
+ {assign var=title value=\QUI\ERP\Products\Handler\Manufacturers::getManufacturerTitle($userId)}
+
+ {strip}
+ <div class="cologne-products-manufacturerList-entry-image">
+ <a href="{\QUI\ERP\Products\Handler\Manufacturers::getManufacturerUrl($userId)}" title="{$title|escape:'html'}"
+ class="cologne-products-manufacturerList-entry-image-link">
+ {image image=\QUI\ERP\Products\Handler\Manufacturers::getManufacturerImage($userId) title=$title width=400}
+ </a>
+ </div>
+ <div class="cologne-products-manufacturerList-entry-content">
+ <header class="cologne-products-manufacturerList-entry-content-header">
+ <h3 class="cologne-products-manufacturerList-entry-content-header-title">
+ {$title}
+ </h3>
+ </header>
+
+ <div class="cologne-products-manufacturerList-entry-content-short"></div>
+
+ <div class="cologne-products-manufacturerList-entry-content-buttonContainer">
+ <a href="{\QUI\ERP\Products\Handler\Manufacturers::getManufacturerUrl($userId)}" title="{$title|escape:'html'}"
+ class="btn btn-primary btn-outline cologne-products-manufacturerList-entry-content-button">
+ {locale group='quiqqer/product-bricks' var='brick.control.categoryBox.viewProduct'}
+ </a>
+ </div>
+ </div>
+ </a>
+ {/strip}
+</article>
+{/foreach}
\ No newline at end of file
diff --git a/template/menu/menuPrefix.html b/template/menu/menuPrefix.html
index 0758e921f549af69897ed301aea77dfabf4eed11..25dc88347fca9b4117626d312164d908fc3a135b 100644
--- a/template/menu/menuPrefix.html
+++ b/template/menu/menuPrefix.html
@@ -8,7 +8,7 @@
{* <!-- Logo --> *}
<div class="cologne-header-logo template-column">
- <a href="/" class="cologne-header-logo-link">
+ <a href="{$Project->get(1)->getUrlRewritten()}" class="cologne-header-logo-link">
{image image=$Logo class="logo" height="100"}
</a>
</div>
\ No newline at end of file