Skip to content
Code-Schnipsel Gruppen Projekte
Commit be209347 erstellt von Michael Danielczok's avatar Michael Danielczok
Dateien durchsuchen

fix: Lang Currency Switch: no dropdown if there are nothing to show. 

refactor: Many small changes.
fix: Search on product search site works.
Übergeordneter b7d7492d
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
Leerzeichenänderungen ausblenden
Inline Nebeneinander
bin/css/products.css
+ 0
− 5
Zeige Datei @ be209347
...@@ -429,11 +429,6 @@ ...@@ -429,11 +429,6 @@
width: 40px; width: 40px;
} }
.quiqqer-products-productList-products {
float: none !important;
}
.quiqqer-product-list { .quiqqer-product-list {
margin: 2em 0; margin: 2em 0;
position: relative; position: relative;
......
bin/css/style.css
+ 5
− 0
Zeige Datei @ be209347
...@@ -499,6 +499,10 @@ a.toTop:before { ...@@ -499,6 +499,10 @@ a.toTop:before {
display: flex; display: flex;
} }
.topbar-left > p {
margin-bottom: 0;
}
.topbar-contact-mail, .topbar-contact-mail,
.topbar-phone { .topbar-phone {
margin-right: 20px; margin-right: 20px;
...@@ -614,6 +618,7 @@ a.toTop:before { ...@@ -614,6 +618,7 @@ a.toTop:before {
@media screen and (max-width: 767px) { @media screen and (max-width: 767px) {
.template-search { .template-search {
min-width: auto; min-width: auto;
flex-grow: 1;
} }
.quiqqer-products-search-suggest-form .input-search-icon { .quiqqer-products-search-suggest-form .input-search-icon {
......
bin/javascript/controls/LangCurrencySwitch.js
+ 7
− 4
Zeige Datei @ be209347
...@@ -83,7 +83,7 @@ define('package/quiqqer/template-cologne/bin/javascript/controls/LangCurrencySwi ...@@ -83,7 +83,7 @@ define('package/quiqqer/template-cologne/bin/javascript/controls/LangCurrencySwi
self.open(); self.open();
}); });
}) });
}, },
$checkLang: function () { $checkLang: function () {
...@@ -115,12 +115,15 @@ define('package/quiqqer/template-cologne/bin/javascript/controls/LangCurrencySwi ...@@ -115,12 +115,15 @@ define('package/quiqqer/template-cologne/bin/javascript/controls/LangCurrencySwi
}, { }, {
'package': 'quiqqer/template-cologne' 'package': 'quiqqer/template-cologne'
}); });
}) });
}, },
$checkCurrencies: function () { $checkCurrencies: function () {
var self = this; var self = this;
console.log(self.getAttribute('currencySwitch'));
console.log(self.getAttribute('userrelatedcurrency'));
return new Promise(function (resolve) { return new Promise(function (resolve) {
if (!self.getAttribute('currencySwitch') || if (!self.getAttribute('currencySwitch') ||
!self.getAttribute('userrelatedcurrency')) { !self.getAttribute('userrelatedcurrency')) {
...@@ -136,7 +139,7 @@ define('package/quiqqer/template-cologne/bin/javascript/controls/LangCurrencySwi ...@@ -136,7 +139,7 @@ define('package/quiqqer/template-cologne/bin/javascript/controls/LangCurrencySwi
} }
resolve(); resolve();
}); });
}) });
}, },
/** /**
...@@ -157,7 +160,7 @@ define('package/quiqqer/template-cologne/bin/javascript/controls/LangCurrencySwi ...@@ -157,7 +160,7 @@ define('package/quiqqer/template-cologne/bin/javascript/controls/LangCurrencySwi
this.createMenu().then(function () { this.createMenu().then(function () {
if (!self.currencySwitch || !self.langSwitch) { if (!self.currencySwitch || !self.langSwitch) {
self.Menu.addClass('single-control') self.Menu.addClass('single-control');
} }
self.Menu.inject(self.MenuWrapper); self.Menu.inject(self.MenuWrapper);
......
bin/javascript/init.js
+ 27
− 10
Zeige Datei @ be209347
...@@ -3,12 +3,15 @@ var lg = 'quiqqer/template-cologne'; ...@@ -3,12 +3,15 @@ var lg = 'quiqqer/template-cologne';
window.addEvent('domready', function () { window.addEvent('domready', function () {
"use strict"; "use strict";
initMobileMenu();
require([ require([
'qui/QUI' 'qui/QUI'
], function (QUI) { ], function (QUI) {
if (SHOW_CATEGORY_MENU) {
initMobileMenu();
}
/** /**
* toTop button * toTop button
*/ */
...@@ -351,8 +354,8 @@ function createLogoutWindow (LogoutWindow) { ...@@ -351,8 +354,8 @@ function createLogoutWindow (LogoutWindow) {
moofx(ContentElm).animate({ moofx(ContentElm).animate({
opacity: 1 opacity: 1
}); });
}) });
}).delay(50) }).delay(50);
} }
} }
}).open(); }).open();
...@@ -376,18 +379,32 @@ function createLoginWindow () { ...@@ -376,18 +379,32 @@ function createLoginWindow () {
} }
} }
}).open(); }).open();
}) });
} }
/** /**
* Menu mobile * Menu mobile
*/ */
function initMobileMenu() { function initMobileMenu () {
var OpenCategoryBtn = document.getElement('.shop-category-menu-button'),
MenuElm = document.getElement('[data-qui="package/quiqqer/menu/bin/SlideOut"]');
var OpenMenuBtn = document.getElement('.shop-category-menu-button'); if (!OpenCategoryBtn) {
console.log(OpenMenuBtn) console.error('Open Category Button not found.');
console.log(1) return;
if (OpenMenuBtn) {
console.log(OpenMenuBtn)
} }
require(['utils/Controls'], function (Controls) {
Controls.getControlByElement(MenuElm).then(function (MenuControl) {
/*console.log(OpenCategoryBtn)
OpenCategoryBtn.removeEvents('click');
console.log(OpenCategoryBtn)
console.log(MenuControl);*/
});
});
} }
\ No newline at end of file
index.html
+ 38
− 37
Zeige Datei @ be209347
...@@ -28,9 +28,10 @@ ...@@ -28,9 +28,10 @@
<script> <script>
var BASKET_STYLE = "{$basketStyle}"; var BASKET_STYLE = "{$basketStyle}";
var BASKET_OPEN = "{$basketOpen}"; var BASKET_OPEN = "{$basketOpen}";
var INITAL_BASKET_PRICE = "{$initialBasketPrice}"; var INITAL_BASKET_PRICE = "{$initialBasketPrice}";
var COUNT_LANGUAGES = "{$countLanguages}"; var COUNT_LANGUAGES = "{$countLanguages}";
var SHOW_CATEGORY_MENU = "{$showCategoryMenu}";
</script> </script>
</head> </head>
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
{* small top bar *} {* small top bar *}
{fetch template="template/topBar.html" Project=$Project Menu=$Menu User=$User Avatar=$Avatar {fetch template="template/topBar.html" Project=$Project Menu=$Menu User=$User Avatar=$Avatar
Flags=$Flags LangCurrencySwitch=$LangCurrencySwitch Search=$Search} Flags=$Flags LangCurrencySwitch=$LangCurrencySwitch Search=$Search}
{* main navigation / menu *} {* main navigation / menu *}
<div> <div>
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
</div> </div>
{if $header == 'afterNav' && $Site->getAttribute('image_emotion')} {if $header == 'afterNav' && $Site->getAttribute('image_emotion')}
{fetch template="template/pageHeader.html" Site=$Site pageTitle=$pageTitle} {fetch template="template/pageHeader.html" Site=$Site pageTitle=$pageTitle}
{/if} {/if}
{* <!--Shop category menu--> *} {* <!--Shop category menu--> *}
...@@ -62,25 +63,25 @@ ...@@ -62,25 +63,25 @@
<!-- breadcrumb --> <!-- breadcrumb -->
{if $showBreadcrumb} {if $showBreadcrumb}
{fetch template="template/breadcrumb.html" Site=$Site pageTitle=$pageTitle} {fetch template="template/breadcrumb.html" Site=$Site pageTitle=$pageTitle}
{/if} {/if}
{assign var=headerSuffix value=$BricksManager->getBricksByArea('headerSuffix', $Site)} {assign var=headerSuffix value=$BricksManager->getBricksByArea('headerSuffix', $Site)}
{foreach $headerSuffix as $Brick} {foreach $headerSuffix as $Brick}
{assign var=brickFullWidth value=''} {assign var=brickFullWidth value=''}
{if $Brick->getSetting( 'general.fullWidth' )} {if $Brick->getSetting( 'general.fullWidth' )}
{assign var=brickFullWidth value='brick-full-width'} {assign var=brickFullWidth value='brick-full-width'}
{/if} {/if}
{assign var=brickNoPadding value=""} {assign var=brickNoPadding value=""}
{if $Brick->getSetting('general.noSpacing')} {if $Brick->getSetting('general.noSpacing')}
{assign var=brickNoPadding value="brick-no-spacing"} {assign var=brickNoPadding value="brick-no-spacing"}
{/if} {/if}
<section class="template-brick-container template-brick-headerSuffix brick-id-{$Brick->getAttribute('id')}"> <section class="template-brick-container template-brick-headerSuffix brick-id-{$Brick->getAttribute('id')}">
<div class="template-grid-container template-grid-row {$brickFullWidth} {$brickNoPadding}"> <div class="template-grid-container template-grid-row {$brickFullWidth} {$brickNoPadding}">
{$Brick->create()} {$Brick->create()}
</div> </div>
</section> </section>
{/foreach} {/foreach}
<main class="cologne-main"> <main class="cologne-main">
...@@ -91,20 +92,20 @@ ...@@ -91,20 +92,20 @@
{assign var=footerPrefix value=$BricksManager->getBricksByArea('footerPrefix', $Site)} {assign var=footerPrefix value=$BricksManager->getBricksByArea('footerPrefix', $Site)}
{foreach $footerPrefix as $Brick} {foreach $footerPrefix as $Brick}
{assign var=brickFullWidth value=''} {assign var=brickFullWidth value=''}
{if $Brick->getSetting( 'general.fullWidth' )} {if $Brick->getSetting( 'general.fullWidth' )}
{assign var=brickFullWidth value='brick-full-width'} {assign var=brickFullWidth value='brick-full-width'}
{/if} {/if}
{assign var=brickNoPadding value=""} {assign var=brickNoPadding value=""}
{if $Brick->getSetting('general.noSpacing')} {if $Brick->getSetting('general.noSpacing')}
{assign var=brickNoPadding value="brick-no-spacing"} {assign var=brickNoPadding value="brick-no-spacing"}
{/if} {/if}
<section class="template-brick-container template-brick-footerPrefix brick-id-{$Brick->getAttribute('id')}"> <section class="template-brick-container template-brick-footerPrefix brick-id-{$Brick->getAttribute('id')}">
<div class="template-grid-container template-grid-row {$brickFullWidth} {$brickNoPadding}"> <div class="template-grid-container template-grid-row {$brickFullWidth} {$brickNoPadding}">
{$Brick->create()} {$Brick->create()}
</div> </div>
</section> </section>
{/foreach} {/foreach}
<footer class="template-footer"> <footer class="template-footer">
...@@ -113,11 +114,11 @@ ...@@ -113,11 +114,11 @@
{* pre-defined footer *} {* pre-defined footer *}
{fetch template="template/footer.predefined.html" {fetch template="template/footer.predefined.html"
Site=$Site Site=$Site
paymentsData=$paymentsData paymentsData=$paymentsData
shortText=$shortText shortText=$shortText
urlList=$urlList urlList=$urlList
featuredProducts=$featuredProducts featuredProducts=$featuredProducts
} }
{* footer copyright *} {* footer copyright *}
......
locale.xml
+ 5
− 5
Zeige Datei @ be209347
...@@ -192,12 +192,12 @@ ...@@ -192,12 +192,12 @@
<locale name="template.topbar.content.left" html="true"> <locale name="template.topbar.content.left" html="true">
<de><![CDATA[ <de><![CDATA[
<span class="topbar-contact-mail"> <span class="topbar-contact-mail">
<span class="fa fa-envelope-o"></span> <span class="fa fa-envelope-o">&nbsp;</span>
<a href="mailto:info@e-commerce.de">info@e-commerce.de</a> <a href="mailto:info@e-commerce.de">info@e-commerce.de</a>
</span> </span>
<span class="topbar-phone"> <span class="topbar-phone">
<span class="fa fa-phone"></span> <span class="fa fa-phone">&nbsp;</span>
0202 2454545 0202 2454545
</span> </span>
...@@ -209,12 +209,12 @@ ...@@ -209,12 +209,12 @@
</de> </de>
<en><![CDATA[ <en><![CDATA[
<span class="topbar-contact-mail"> <span class="topbar-contact-mail">
<span class="fa fa-envelope-o"></span> <span class="fa fa-envelope-o">&nbsp;</span>
<a href="mailto:info@e-commerce.de">info@e-commerce.de</a> <a href="mailto:info@e-commerce.de">info@e-commerce.de</a>
</span> </span>
<span class="topbar-phone"> <span class="topbar-phone">
<span class="fa fa-phone"></span> <span class="fa fa-phone">&nbsp;</span>
0202 2454545 0202 2454545
</span> </span>
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
<en><![CDATA[Breadcrumb settings]]></en> <en><![CDATA[Breadcrumb settings]]></en>
</locale> </locale>
<locale name="settings.breadcrumb.text" html="true"> <locale name="settings.breadcrumb.text" html="true">
<de><![CDATA[Brotkrumennavigation anzeigen? <br/>Bestimmen Sie für jeden Seitentyp, ob die Brotkrumennavigation angezeigt werden soll.]]></de> <pl><![CDATA[Brotkrumennavigation anzeigen? <br/>Bestimmen Sie für jeden Seitentyp, ob die Brotkrumennavigation angezeigt werden soll.]]></pl>
<en><![CDATA[Display breadcrumb? <br/>For each page type, specify if you want the breadcrumb navigation to be displayed.]]></en> <en><![CDATA[Display breadcrumb? <br/>For each page type, specify if you want the breadcrumb navigation to be displayed.]]></en>
</locale> </locale>
......
src/QUI/TemplateCologne/Controls/LangCurrencySwitch.css
+ 4
− 0
Zeige Datei @ be209347
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
color: #9ba3ad; color: #9ba3ad;
} }
.lcs-button.lcs-button__no-hover .fa {
display: none;
}
.lcs-button-flag { .lcs-button-flag {
border-right: 1px solid #ddd; border-right: 1px solid #ddd;
padding: 0 1rem; padding: 0 1rem;
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren

PCSG & QUIQQER support and DEV System - GitLab