Skip to content
Code-Schnipsel Gruppen Projekte
Commit bed3abfb erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'dev' of https://dev.quiqqer.com/quiqqer/template-cologne into dev

Übergeordnete aaa80a5a 5b11bc4b
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
Leerzeichenänderungen ausblenden
Inline Nebeneinander
werden angezeigt mit 287 Ergänzungen und 48 Löschungen
bin/css/frontend-users.css
+ 39
− 12
Zeige Datei @ bed3abfb
.templateCologne-frontendUsers-profile-container-login {
margin-top: 2rem;
margin-bottom: 2rem;
margin-top: 2rem;
}
.quiqqer-frontend-users-address-description-button {
max-width: 100% !important;
max-width: 100% !important;
}
/********************/
......@@ -21,9 +21,9 @@
}
.quiqqer-frontendUsers-profile-container {
margin-top: 2rem;
margin-bottom: 2rem;
display: flex;
margin-bottom: 2rem;
margin-top: 2rem;
}
.quiqqer-frontendUsers-controls-profile .quiqqer-frontendUsers-controls-profile-categories {
......@@ -131,7 +131,7 @@
}
.quiqqer-frontendUsers-userdata-section, .quiqqer-frontendUsers-userdata-address, .quiqqer-frontendUsers-userdata-address-additional {
max-width: 100% !important;
max-width: 100% !important;
}
.quiqqer-frontend-users-address header,
......@@ -215,11 +215,11 @@
}
.quiqqer-fu-login-container {
position: relative;
width: 100%;
max-width: 400px;
background: #f8f8f8;
border: 1px solid #ddd;
max-width: 400px;
position: relative;
width: 100%;
}
@media screen and (max-width: 767px) {
......@@ -232,14 +232,41 @@
/* reset password */
/******************/
.quiqqer-fu-login-container .quiqqer-fu-login-forget-password-reset [name="cancel"] {
color: inherit;
border: none;
padding: 0;
background: none;
position: initial;
border: none;
color: inherit;
float: right;
margin-top: 1rem;
padding: 0;
position: initial;
}
.quiqqer-fu-login-container .quiqqer-fu-login-forget-password-reset [type="submit"] {
margin-top: 1rem;
}
/*******************/
/* Login site type */
/*******************/
.loginAndRegister .quiqqer-fu-login-forget-password-link {
margin-bottom: 1rem;
}
.loginAndRegister-register .quiqqer-fu-registrationSignUp-registration-content {
align-items: center;
border: 1px solid #ddd;
height: 100%;
margin: 0 auto;
max-width: 400px;
overflow: hidden;
}
.loginAndRegister .quiqqer-fu-login-forget-password-reset {
padding: 1.5rem 2rem;
background: #f8f8f8;
}
.quiqqer-fu-registrationSignUp-terms-text [name="decline"] {
right: 0 !important;
}
\ No newline at end of file
bin/css/mini-basket.css
+ 10
− 0
Zeige Datei @ bed3abfb
......@@ -111,4 +111,14 @@ body.header-fixed .quiqqer-order-basket-small-container {
.quiqqer-order-basket-small-buttons .open-shopping-cart {
margin-right: 1rem;
}
/*********************/
/* payments - paypal */
/*********************/
.quiqqer-order-basket-small-container .quiqqer-payment-paypal-express {
margin-top: 15px;
text-align: right;
width: 100%;
height: auto;
}
\ No newline at end of file
bin/css/order.css
+ 35
− 23
Zeige Datei @ bed3abfb
......@@ -25,18 +25,18 @@
}
.quiqqer-order-basket-articles td {
border: none;
padding-bottom: 10px;
vertical-align: top;
border: none;
}
.quiqqer-order-basket-articles th {
background: #f8f8f8;
border-bottom: 1px solid #ddd;
border-left: none;
border-top: 1px solid #ddd;
padding: 5px 10px;
width: 10px;
border-left: none;
}
th.quiqqer-order-basket-articles-header-pos {
......@@ -75,8 +75,8 @@ th.quiqqer-order-basket-articles-header-pos {
.quiqqer-order-basket-articles-article-quantity input {
height: 30px;
line-height: 30px;
width: 100px;
text-align: right;
width: 100px;
}
.quiqqer-order-basket-articles-unitPrice {
......@@ -84,15 +84,15 @@ th.quiqqer-order-basket-articles-header-pos {
}
td.quiqqer-order-basket-articles-article-remove {
padding-right: 0;
text-align: right;
width: 60px;
padding-right: 0;
}
.quiqqer-order-basket-articles-article-remove button {
color: inherit;
background: none;
border-color: transparent;
color: inherit;
padding: 0 10px;
}
......@@ -131,13 +131,13 @@ td.quiqqer-order-basket-articles-article-remove button:hover {
}
.quiqqer-order-basket-total {
background: #f8f8f8;
border: 1px solid #ddd;
float: right;
margin-top: 20px;
padding: 5px 10px;
text-align: right;
width: 100%;
background: #f8f8f8;
border: 1px solid #ddd;
padding: 5px 10px;
}
.quiqqer-order-basket-total td {
......@@ -180,13 +180,13 @@ td.quiqqer-order-basket-articles-article-remove button:hover {
input.quiqqer-coupons-couponcodeinput-input:hover,
input.quiqqer-coupons-couponcodeinput-input:focus,
input.quiqqer-coupons-couponcodeinput-input:active {
border-color: #28a745;
background: #fff;
border-color: #28a745;
}
.btn.quiqqer-coupons-couponcodeinput-btn {
border-color: #28a745;
background: #fff;
border-color: #28a745;
color: #28a745;
}
......@@ -274,8 +274,8 @@ input.quiqqer-coupons-couponcodeinput-input:active {
.quiqqer-order-customerData-container .quiqqer-order-customerData,
.quiqqer-order-customerData-container .quiqqer-order-customerData-comment {
width: 100%;
max-width: 100%;
width: 100%;
}
.quiqqer-order-customerData {
......@@ -435,14 +435,14 @@ input.quiqqer-coupons-couponcodeinput-input:active {
}
.quiqqer-order-basket-end .quiqqer-coupons-couponcodeinput {
flex-direction: column;
padding: 0;
text-align: left;
flex-direction: column;
}
.quiqqer-order-basket-end .quiqqer-coupons-couponcodeinput input {
width: 100%;
margin-bottom: 1rem;
width: 100%;
}
.quiqqer-coupons-couponcodeinput label span {
......@@ -471,16 +471,16 @@ input.quiqqer-coupons-couponcodeinput-input:active {
table.articles-article {
border-bottom: none;
border-spacing: 0;
margin: 4rem 0 0;
padding-bottom: 0 !important;
width: 100%;
margin: 4rem 0 0;
}
.articles-article td {
border: none;
padding: 10px;
vertical-align: top;
text-align: right;
border: none;
vertical-align: top;
}
td.articles-article-information {
......@@ -495,11 +495,11 @@ td.articles-article-information {
.articles-article-header th {
background: #f8f8f8;
border-bottom: 1px solid #ddd;
border-left: none;
border-top: 1px solid #ddd;
padding: 5px 10px;
width: 10px;
text-align: right;
border-left: none;
width: 10px;
}
th.articles-article-header-information {
......@@ -529,21 +529,21 @@ th.articles-article-header-information {
}
.quiqqer-order-step-checkout-notice label {
display: flex;
padding: 10px;
background: #f8f8f8;
border: 1px solid #ddd;
cursor: pointer;
display: flex;
padding: 10px;
}
.articles-sum {
background: #f8f8f8;
border: 1px solid #ddd;
float: right;
margin-top: 20px;
padding: 5px 10px;
text-align: right;
width: 100%;
background: #f8f8f8;
border: 1px solid #ddd;
padding: 5px 10px;
}
table.articles-sum td {
......@@ -577,11 +577,23 @@ table.articles-sum td {
/**********************/
/* step: order (last) */
/**********************/
.quiqqer-order-control-orderLikeBasket .quiqqer-order-control-order-information-orderData-table {
background: #f8f8f8;
border: 1px solid #ddd;
padding: 5px 10px;
width: 100% !important;
}
.quiqqer-order-control-orderLikeBasket .quiqqer-order-control-order-total td {
border: none;
padding-bottom: 5px;
text-align: right;
}
.quiqqer-order-control-orderLikeBasket .quiqqer-order-control-order-total td:last-child {
width: 150px;
}
.quiqqer-order-control-order-information-orderData-subSum-text,
.quiqqer-order-control-order-information-orderData-subSum-value {
border-bottom: 1px solid #999999;
......
bin/css/style.css
+ 9
− 0
Zeige Datei @ bed3abfb
......@@ -1435,6 +1435,15 @@ a.toTop:before {
margin: 0 auto 30px !important;
}
/* sing up / registration in link */
.login-popup-create-account-wrapper {
position: absolute;
bottom: 10px;
width: 100%;
left: 0;
text-align: center;
}
/** Product Children Slider (horizontal)
===================================== */
.quiqqer-bricks-children-slider-container-wrapper .quiqqer-bricks-children-slider-container,
......
bin/javascript/init.js
+ 22
− 2
Zeige Datei @ bed3abfb
......@@ -415,14 +415,34 @@ function createLogoutWindow (LogoutWindow) {
*/
function createLoginWindow () {
require([
'Locale',
'utils/Controls',
'package/quiqqer/frontend-users/bin/frontend/controls/login/Window'
], function (LoginWindow) {
], function (QUILocale, QUIControlUtils, LoginWindow) {
new LoginWindow({
class : 'cologne-login-dialog',
title : false,
maxHeight: 500,
maxHeight: 550,
maxWidth : 400,
events : {
onOpen : function (LoginWindow) {
if (!REGISTER_URL) {
return;
}
var Elm = LoginWindow.getElm();
var CreateAccountWrapper = new Element('div', {
'class': 'login-popup-create-account-wrapper'
});
new Element('a', {
href: REGISTER_URL,
html: QUILocale.get('quiqqer/template-cologne', 'template.popup.login.registration.button'),
}).inject(CreateAccountWrapper);
CreateAccountWrapper.inject(Elm.getElement('.qui-window-popup-content'));
},
onSuccess: function () {
window.location.reload();
}
......
index.html
+ 1
− 0
Zeige Datei @ bed3abfb
......@@ -33,6 +33,7 @@
var INITAL_BASKET_PRICE = "{$initialBasketPrice}";
var COUNT_LANGUAGES = "{$countLanguages}";
var SHOW_CATEGORY_MENU = "{$showCategoryMenu}";
var REGISTER_URL = "{$registerSiteUrl}";
</script>
</head>
......
index.php
+ 18
− 0
Zeige Datei @ bed3abfb
......@@ -77,6 +77,22 @@
*/
$LangCurrencySwitch = new \QUI\TemplateCologne\Controls\LangCurrencySwitch();
/**
* Sign up / registration page
*/
$registerSiteUrl = false;
$registerSite = $Project->getSites([
'where' => [
'type' => [
'value' => 'quiqqer/template-cologne:types/registration'
]
],
'limit' => 1
]);
if (count($registerSite)) {
$registerSiteUrl = $registerSite[0]->getUrlRewritten();
}
// array to assign
$templateSettings['BricksManager'] = QUI\Bricks\Manager::init();
......@@ -90,5 +106,7 @@
$templateSettings['Search'] = new QUI\ERP\Products\Controls\Search\Suggest([
'globalsearch' => true
]);
$templateSettings['registerSiteUrl'] = $registerSiteUrl;
$Engine->assign($templateSettings);
locale.xml
+ 31
− 0
Zeige Datei @ bed3abfb
......@@ -625,6 +625,32 @@
<de><![CDATA[Produkte durchsuchen]]></de>
<en><![CDATA[Search products]]></en>
</locale>
<locale name="template.basket.small.otherPaymentMethodsSpacer" html="true">
<de><![CDATA[- oder -]]></de>
<en><![CDATA[- or -]]></en>
</locale>
<!-- site types -->
<locale name="admin.types.registration">
<de><![CDATA[Registrierung]]></de>
<en><![CDATA[Registration]]></en>
</locale>
<locale name="admin.types.setting.registration">
<de><![CDATA[Registrierung]]></de>
<en><![CDATA[Registration]]></en>
</locale>
<locale name="quiqqer.settings.registration.contentPos">
<de><![CDATA[Wo soll der Seiteninhalt angezeigt werden?]]></de>
<en><![CDATA[Where should the page content be displayed?]]></en>
</locale>
<locale name="quiqqer.settings.registration.contentPos.nextToRegistrationForm">
<de><![CDATA[Neben dem Registrierungsformular]]></de>
<en><![CDATA[Next to the registration form]]></en>
</locale>
<locale name="quiqqer.settings.registration.contentPos.beforeRegistrationForm">
<de><![CDATA[Vor dem Registrierungsformular]]></de>
<en><![CDATA[Before the registration form]]></en>
</locale>
</groups>
......@@ -633,6 +659,11 @@
<de><![CDATA[Abmelden]]></de>
<en><![CDATA[Logout]]></en>
</locale>
<locale name="template.popup.login.registration.button">
<de><![CDATA[Kundenkonto anlegen]]></de>
<en><![CDATA[Create account]]></en>
</locale>
</groups>
</locales>
\ No newline at end of file
quiqqer/order/src/QUI/ERP/Order/Controls/Basket/Small.html
+ 17
− 1
Zeige Datei @ bed3abfb
{template_event name="quiqqer::order::basketSmall::begin" Basket=$Basket}
<div class="quiqqer-order-basket-small-articles">
{assign var=pos value=1}
{foreach $products as $product}
......@@ -42,6 +44,8 @@
{/foreach}
</div>
{template_event name="quiqqer::order::basketSmall::middle" Basket=$Basket}
<table class="quiqqer-order-basket-small-total">
<tr class="quiqqer-order-basket-small-total-subSum">
<td class="quiqqer-order-basket-small-total-firstCell">
......@@ -96,6 +100,8 @@
</tr>
</table>
{template_event name="quiqqer::order::basketSmall::beforeCheckoutButton" Basket=$Basket}
<div class="quiqqer-order-basket-small-buttons">
<a href="{$shoppingCartUrl}" class="open-shopping-cart btn btn-light">
{locale group="quiqqer/order" var="control.basket.small.shoppingCart.button"}
......@@ -104,4 +110,14 @@
<a href="{$checkoutUrl}" class="open-checkout btn btn-success">
{locale group="quiqqer/order" var="control.basket.small.buy.button"}
</a>
</div>
\ No newline at end of file
</div>
{template_event name="quiqqer::order::basketSmall::end" Basket=$Basket}
<style>
.quiqqer-order-basket-small-buttons + *:before {
content: '{locale group="quiqqer/template-cologne" var="template.basket.small.otherPaymentMethodsSpacer"}';
margin: 0 0 15px;
display: block;
}
</style>
\ No newline at end of file
site.xml
+ 49
− 10
Zeige Datei @ bed3abfb
......@@ -59,52 +59,91 @@
<layout type="layout/startPage"
image="bin/layouts/startPage.png">
<title>
<locale group="quiqqer/template-cologne" var="admin.layout.startpage" />
<locale group="quiqqer/template-cologne" var="admin.layout.startpage"/>
</title>
<description>
<locale group="quiqqer/template-cologne" var="admin.layout.startpage.desc" />
<locale group="quiqqer/template-cologne" var="admin.layout.startpage.desc"/>
</description>
</layout>
<layout type="layout/noSidebar"
image="bin/layouts/noSidebar.png">
<title>
<locale group="quiqqer/template-cologne" var="admin.layout.noSidebar" />
<locale group="quiqqer/template-cologne" var="admin.layout.noSidebar"/>
</title>
<description>
<locale group="quiqqer/template-cologne" var="admin.layout.noSidebar.desc" />
<locale group="quiqqer/template-cologne" var="admin.layout.noSidebar.desc"/>
</description>
</layout>
<layout type="layout/noSidebarThin"
image="bin/layouts/noSidebarThin.png">
<title>
<locale group="quiqqer/template-cologne" var="admin.layout.noSidebarThin" />
<locale group="quiqqer/template-cologne" var="admin.layout.noSidebarThin"/>
</title>
<description>
<locale group="quiqqer/template-cologne" var="admin.layout.noSidebarThin.desc" />
<locale group="quiqqer/template-cologne" var="admin.layout.noSidebarThin.desc"/>
</description>
</layout>
<layout type="layout/leftSidebar"
image="bin/layouts/leftSidebar.png">
<title>
<locale group="quiqqer/template-cologne" var="admin.layout.leftSidebar" />
<locale group="quiqqer/template-cologne" var="admin.layout.leftSidebar"/>
</title>
<description>
<locale group="quiqqer/template-cologne" var="admin.layout.leftSidebar.desc" />
<locale group="quiqqer/template-cologne" var="admin.layout.leftSidebar.desc"/>
</description>
</layout>
<layout type="layout/rightSidebar"
image="bin/layouts/rightSidebar.png">
<title>
<locale group="quiqqer/template-cologne" var="admin.layout.rightSidebar" />
<locale group="quiqqer/template-cologne" var="admin.layout.rightSidebar"/>
</title>
<description>
<locale group="quiqqer/template-cologne" var="admin.layout.rightSidebar.desc" />
<locale group="quiqqer/template-cologne" var="admin.layout.rightSidebar.desc"/>
</description>
</layout>
</layouts>
<!-- types -->
<types>
<!-- user register -->
<type type="types/registration" icon="fa fa-user-plus">
<locale group="quiqqer/template-cologne" var="admin.types.registration"/>
<!-- extra attributes -->
<attributes>
<attribute default="nextToRegistrationForm">quiqqer.settings.registration.contentPos</attribute>
</attributes>
<settings>
<category name="registration-settings">
<settings>
<title>
<locale group="quiqqer/template-cologne" var="admin.types.setting.registration"/>
</title>
<select conf="quiqqer.settings.registration.contentPos">
<text>
<locale group="quiqqer/template-cologne"
var="quiqqer.settings.registration.contentPos"/>
</text>
<option value="nextToRegistrationForm">
<locale group="quiqqer/template-cologne"
var="quiqqer.settings.registration.contentPos.nextToRegistrationForm"
/>
</option>
<option value="beforeRegistrationForm">
<locale group="quiqqer/template-cologne"
var="quiqqer.settings.registration.contentPos.beforeRegistrationForm"
/>
</option>
</select>
</settings>
</category>
</settings>
</type>
</types>
</site>
types/registration.html 0 → 100644
+ 11
− 0
Zeige Datei @ bed3abfb
{if $Site->getAttribute('quiqqer.settings.registration.contentPos') == 'beforeRegistrationForm'
&& $Template->getAttribute('content-body') && $Site->getAttribute('content')}
<section class="content-body grid-100 mobile-grid-100 grid-parent">
{$Site->getAttribute('content')}
</section>
{/if}
<div class="content-template" style="min-height: 350px;">
{$Registration->create()}
</div>
types/registration.php 0 → 100644
+ 45
− 0
Zeige Datei @ bed3abfb
<?php
/**
* Registration Sign Up Site Type
*/
use QUI\Utils\Security\Orthos;
$Site->setAttribute('nocache', 1);
// Determine what happens if the user is already logged in
if (QUI::getUserBySession()->getId()) {
try {
$FrontendUsersHandler = QUI\FrontendUsers\Handler::getInstance();
$registrationSettings = $FrontendUsersHandler->getRegistrationSettings();
if ($registrationSettings['visitRegistrationSiteBehaviour'] === 'showProfile') {
$ProfileSite = $FrontendUsersHandler->getProfileSite($Site->getProject());
if ($ProfileSite) {
header('Location: ' . $ProfileSite->getUrlRewritten());
exit;
}
}
} catch (QUI\Exception $Exception) {
QUI\System\Log::writeDebugException($Exception);
}
}
$siteContent = false;
if ($Site->getAttribute('quiqqer.settings.registration.contentPos') == 'nextToRegistrationForm' && $Site->getAttribute('content')) {
$siteContent = $Site->getAttribute('content');
}
/**
* Registration / Sign up
*/
$Registration = new QUI\FrontendUsers\Controls\RegistrationSignUp([
'content' => $siteContent
]);
$Engine->assign([
'Registration' => $Registration,
]);
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