Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 5923) +++ /views/css/frontend.css (revision 5928) @@ -155,5 +155,5 @@ .wpsg_produkt_wrapper .wpsg_add_basket { margin:1rem 0; float:right; } .wpsg_produkt_wrapper .wpsg_produkt_add_basket_wrapper { clear:both; float:left; margin:1rem 0 0 0; } -.wpsg_produkt_wrapper .wpsg_label { display:inline; } +.wpsg_produkt_wrapper .wpsg_label { display:inline; font-weight:bold; } .wpsg_produkt_wrapper .wpsg_value { display:inline; } .wpsg_produkt_wrapper .wpsg_preis_prediscount { text-decoration: line-through; } @@ -162,4 +162,36 @@ .wpsg_productform .wpsg_product_layer { z-index:1000; background-color:rgba(125, 125, 125, 0.5); position:absolute; left:-10px; top:-10px; width:100%; height:100%; padding:20px; } .wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; top:50%; margin-left:-8px; margin-top:-5.5px; } + +.wpsg_produkt_wrapper .wpsg_product_afterimage { float:left; width:50%; } +.wpsg_produkt_wrapper .wpsg_product_image { float:left; width:50%; } +.wpsg_produkt_wrapper .wpsg_mod_deliverytime, +.wpsg_produkt_wrapper .wpsg_mod_weight_produkt, +.wpsg_produkt_wrapper .wpsg_produkt_varianten, +.wpsg_produkt_wrapper .wpsg-mod_produktindex_stock, +.wpsg_produkt_wrapper .wpsg_produkt_fuellmenge { margin:10px 0; } + +.wpsg_produkt_wrapper .wpsg_product_mod_information_left { float:left; width:45%; margin:20px 20px 20px 0; } +.wpsg_produkt_wrapper .wpsg_product_mod_information_right { float:left; width:45%; margin:20px 0 20px 0; } +.wpsg_produkt_wrapper .wpsg_mod_deliverytime_offline { border:1px solid #ff0a0a; } + +.wpsg_produkt_wrapper .wpsg_product_buttons_add_basket .wpsg_amount_label { float:left; } +.wpsg_produkt_wrapper .wpsg_product_button_basket { float:right; margin:30px 0; } +.wpsg_produkt_wrapper .wpsg_add_basket { padding:10px 30px; color:#fff; background-color:#29556e; border:none; text-transform:uppercase; } +.wpsg_produkt_wrapper .wpsg_add_basket { padding:10px 30px; color:#fff; background-color:#29556e; border:none; text-transform:uppercase; } +.wpsg_produkt_wrapper .wpsg_product_button_area { border-top:1px solid #d0e7ef; border-bottom:1px solid #d0e7ef; } +.wpsg_produkt_wrapper .wpsg_producttitle { font-size:25px; margin:20px 0; } +.wpsg_produkt_wrapper .wpsg_produkt_preis label { display:none; } +.wpsg_produkt_wrapper .wpsg_produkt_preis .wpsg_preis { font-size:20px; font-weight:bold; color:#29556E;} +.wpsg_produkt_wrapper .wpsg_product_price_area { margin-bottom:20px; } +.wpsg_produkt_wrapper .wpsg_product_social_media { border-top:1px solid #d0e7ef; border-bottom:1px solid #d0e7ef; margin:20px 0; } + +.wpsg_product_informationarea { margin:20px 0; } +.wpsg_product_informationarea .wpsg_product_informationarea_reiter { text-transform:uppercase; font-size:20px; font-weight:bold; color:#d0e7ef; } +.wpsg_product_informationarea .wpsg_product_informationarea_reiter:active { font-weight:bold; color:##29556e; text-decoration:underline; } +.wpsg_product_informationarea .wpsg_product_informationarea_reiter:hover { font-weight:bold; color:##29556e; text-decoration:none; } + +.wpsg_product_assessment, .wpsg_product_information_more, .wpsg_product_information_large { width:30%; margin:0 10px; float:left; } + + /* Ajax Meldung ÃŒber das Produkttemplate */ Index: /views/produkttemplates/standard.phtml =================================================================== --- /views/produkttemplates/standard.phtml (revision 5923) +++ /views/produkttemplates/standard.phtml (revision 5928) @@ -14,252 +14,312 @@ ?> -
- - - - callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
- -
+
-

getProductName($this->view['data']['id']); ?>

+
- callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + - - hasMod('wpsg_mod_produktbilder')) { ?> -
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> - view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?> -
- - <?php echo wpsg_hspc($this->view['data']['name']); ?> - -
- - + callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
+ +
+
+ + hasMod('wpsg_mod_produktbilder')) { ?> +
+ callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> + callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> + view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?> +
+ + <?php echo wpsg_hspc($this->view['data']['name']); ?> + +
+ + + + + +
+
+ + +
+
+ +
+ +
+

getProductName($this->view['data']['id']); ?>

+ callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> +
+
+ get_option('wpsg_showArticelnumber') == '1') { ?> +
+ : view['data']['anr']); ?>
+ get_option('wpsg_mod_produktartikel_ean'))) {?> + :view['data']['ean']); ?>
+ + get_option('wpsg_mod_produktartikel_gtin'))) {?> + :view['data']['gtin']); ?>
+
+ + + callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + +
+ + + + view['data']['preis'], $this->get_option('wpsg_currency')); ?> + view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> + + hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> +
+ : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> +
+ +
+ + get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> + +
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> +
+ + + +
+ getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + +
+ + + + + getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> + + + + + +
+

+ view['data']['shortdesc']; ?> +
+ +
+ + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?> +
+ + +
+ + + + + hasMod('wpsg_mod_fuellmenge')) { ?> + +
+ + '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], + ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', + wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) + ); ?> +
+ + + +
+ +
+ + hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> + + + callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) {?> + + get_option('wpsg_mod_deliverytime_storetext')); ?> + get_option('wpsg_page_mod_deliverytime_storelink'))) { ?> +   + +
+ + +
+ + + callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> + +
+ + callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> + +
+ +
+
+ + + + + + + + hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> +
+ + view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> +
+ + + + +
+ callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?> +
+ +
+ +
+ +
+
+ callMods('productForSale', array($this->view['data']['product_key'])) || ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id'])))) { ?> +
+ + + + view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> + /> + + get_option('wpsg_afterinsert'), array('2', '3'))) { ?> + + + +
+ +
+ +
+ + +
+ callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> + callMods('productForSale', array($this->view['data']['product_key']))) { ?> + + + + + + +
+
+ +
+ + hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> + - -
+ +
+ +
+ +
+ + +
+ + view['data']['longdescription'])) > 0) { ?> +
+
+
+

+ view['data']['longdescription']; ?> +
+
- - - get_option('wpsg_showArticelnumber') == '1') { ?> -
- : view['data']['anr']); ?>
- get_option('wpsg_mod_produktartikel_ean'))) {?> - :view['data']['ean']); ?>
- - get_option('wpsg_mod_produktartikel_gtin'))) {?> - :view['data']['gtin']); ?>
-
- - - - callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - -
- - - - view['data']['preis'], $this->get_option('wpsg_currency')); ?> - view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> - - hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> -
- : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> -
- -
- - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - -
- - - - - getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> - - - - - - - hasMod('wpsg_mod_fuellmenge')) { ?> - -
- '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], - ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', - wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) - ); ?> -
- - - - - - hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?> -
- view['data']['stock']); ?> -
- - - - - hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - - - callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) {?> - - get_option('wpsg_mod_deliverytime_storetext')); ?> - get_option('wpsg_page_mod_deliverytime_storelink'))) { ?> -   - -
- - -
- - callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> - -
- - callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> - -
- - - - - - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> -
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> -
- - - - -
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?> -
- - - callMods('productForSale', array($this->view['data']['product_key'])) || ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id'])))) { ?> -
- - - - view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> - /> - - get_option('wpsg_afterinsert'), array('2', '3'))) { ?> - - - -
- - - - callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - callMods('productForSale', array($this->view['data']['product_key']))) { ?> - - - - - - - - hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> - - - -
- - + +
+
+

+
+
+ +
+
+

+
+
+ + +
+ +
+ + +
- -
- -
- - view['data']['beschreibung'])) > 0) { ?> -
- -
- view['data']['beschreibung']; ?>
- -
- - - callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - + + callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
+