Index: /model/wpsg_product.class.php =================================================================== --- /model/wpsg_product.class.php (revision 5556) +++ /model/wpsg_product.class.php (revision 5558) @@ -104,5 +104,15 @@ } // public function getMeta($meta_key) - + + /** + * Gibt die Produktbeschreibung zurÃŒck + */ + public function getShortDescription() + { + + return $this->data['beschreibung']; + + } // public function getShortDescription() + /** * Gibt den Namen des Produktes zurÃŒck Index: /mods/wpsg_mod_productview.class.php =================================================================== --- /mods/wpsg_mod_productview.class.php (revision 5556) +++ /mods/wpsg_mod_productview.class.php (revision 5558) @@ -289,5 +289,6 @@ $this->shop->view['wpsg_mod_productview']['cols'] = wpsg_getStr($atts['cols'], '4'); - + $this->shop->view['wpsg_mod_productview']['mode'] = wpsg_getStr($atts['mode'], 'grid'); + $GLOBALS['wpsg_mod_productview_index'] = $this->shop->view['wpsg_mod_productview']['index'] + 1; @@ -328,5 +329,6 @@ { - $arSubCat = get_terms('wpsg-tax', array( + $arSubCat = get_terms(array( + 'taxonomy' => 'wpsg-tax', 'child_of' => $cat_id )); Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 5556) +++ /views/css/frontend.css (revision 5558) @@ -318,11 +318,15 @@ /* Modul "Produktansichten" */ .wpsg_productview { position:relative; } -.wpsg_productview_head { margin-bottom:25px; line-height:25px; margin-top:25px; } +.wpsg_productview_head { margin-bottom:25px; line-height:25px; margin-top:25px; position:relative; } .wpsg_productview_head h2.wpsg_productview_title { margin-top:0px; font-size:20px; font-weight:bold; color:#0E2F42; } +.wpsg_productview_head .wpsg_mod_productview_modeswitch { position:absolute; right:15px; top:0px; font-size:20px; } +.wpsg_productview_head .wpsg_mod_productview_modeswitch > a { margin-left:5px; text-decoration:none; color:#9E9E9E; } +.wpsg_productview_head .wpsg_mod_productview_modeswitch > a.active, +.wpsg_productview_head .wpsg_mod_productview_modeswitch > a:hover { color:#29556E; text-decoration:none; } .wpsg_mod_productview-info { font-size:14px; color:#9B9B9B; } .wpsg_mod_productview-info strong { color:#29556E; font-weight:bold; } .wpsg_mod_productview-order { font-size:14px; color:#9B9B9B; } .wpsg_mod_productview-order .glyphicon { margin-left:10px; margin-right:5px; } -.wpsg_mod_productview-order strong { color:#29556E; font-weight:bold; } +.wpsg_mod_productview-order strong { color:#29556E; font-weight:bold; float:right; } .wpsg_mod_productview_image { position:relative; } .wpsg_mod_productview_image img { max-width:100%; height:auto; border:1px solid #E4F3F8; } @@ -339,5 +343,4 @@ .wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_button .fa { margin-left:10px; } .wpsg_productview_product .wpsg_mod_productview_go { display:none; position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(228, 243, 248, 0.75); text-align:center; } -.wpsg_productview_product .wpsg_mod_productview_go > .wpsg_star_wrap { font-size:22px; color:#0F303F; width:80%; position:absolute; left:50%; margin-left:-40%; top:10%; font-size:18px; font-weight:normal; } .wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_price_wrap { color:#0F303F; width:100%; position:absolute; left:50%; margin-left:-50%; top:30%; font-size:20px; line-height:125%; font-weight:bold; } .wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_price_wrap .wpsg_mod_productview_oldprice { text-decoration:line-through; } @@ -346,4 +349,6 @@ .wpsg_productview_product:hover { text-decoration:none; } .wpsg_productview_product:hover .wpsg_mod_productview_go { display:block; } +.wpsg_productview_product_grid .wpsg_star_wrap { position:absolute; width:80%; left:50%; top:10%; margin-left:-40%; } +.wpsg_productview_product_grid .wpsg_mod_productview_name h2 { margin-top:0px; } .wpsg_mod_productview_loading { width:100%; height:100%; background-color:rgba(249, 252, 253, 0.75); position:absolute; left:0px; top:0px; } .wpsg_mod_productview_filter #wpsg_mod_productview_filter_price-range { position:relative; margin-right:16px; } Index: /views/mods/mod_productview/productview.js =================================================================== --- /views/mods/mod_productview/productview.js (revision 5556) +++ /views/mods/mod_productview/productview.js (revision 5558) @@ -8,5 +8,17 @@ if (typeof order !== "undefined") atts.order = order; - if (typeof mode !== "undefined") atts.mode = mode; + if (typeof mode !== "undefined") atts.mode = mode; + else + { + + if (jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_modeswitch > a').length > 0) + { + + if (jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_modeswitch > a.fa-th').hasClass('active')) atts.mode = 'grid'; + else atts.mode = 'list'; + + } + + } if (jQuery('#wpsg_mod_productview_filter').length > 0) @@ -41,6 +53,6 @@ { - var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_name').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height); - var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_description').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height); + var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_productview_product_grid .wpsg_mod_productview_name').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height); + var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_productview_product_grid .wpsg_mod_productview_description').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height); // Sortierungslayer @@ -75,5 +87,30 @@ } ).disableSelection(); - + + // Umschalten der List/Grid Ansichten + jQuery('.wpsg_mod_productview_modeswitch > a').bind('click', function() { + + if (jQuery(this).hasClass('fa-th') &&!jQuery(this).hasClass('active')) + { + + jQuery('.wpsg_productview_product_list').hide(250); + jQuery('.wpsg_productview_product_grid').show(250); + + } + else if (jQuery(this).hasClass('fa-list') && !jQuery(this).hasClass('active')) + { + + jQuery('.wpsg_productview_product_grid').hide(250); + jQuery('.wpsg_productview_product_list').show(250); + + } + + jQuery('.wpsg_mod_productview_modeswitch a').removeClass('active'); + jQuery(this).addClass('active'); + + return false; + + } ); + } @@ -145,5 +182,5 @@ } ); - + } ); Index: /views/mods/mod_productview/productview.phtml =================================================================== --- /views/mods/mod_productview/productview.phtml (revision 5556) +++ /views/mods/mod_productview/productview.phtml (revision 5558) @@ -45,5 +45,10 @@ - + +
+ + +
+ @@ -53,5 +58,65 @@ view['wpsg_mod_productview']['products'] as $oProduct) { $i ++; ?> -
+ +
+ +
+ + hasMod('wpsg_mod_produktbilder')) { ?> + callMod('wpsg_mod_produktbilder', 'getProductImage', array($oProduct->id, 520, 520, 'sz')); ?> + +
+ + + +
+ + + +
+ +
+

getProductName(); ?>

+
+ +
+ + +
+ +
+ getOldPrice(); ?> + getPrice()) { ?> +
getPrice(), $this->get_option('wpsg_currency')); ?>
+
get_option('wpsg_currency')); ?>
+ +
getPrice(), $this->get_option('wpsg_currency')); ?>
+ +
+ +
+ getFrontendTaxview() == WPSG_BRUTTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + getFrontendTaxview() == WPSG_NETTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + +
+ + getShortDescription(); if (wpsg_isSizedString($shortDescription)) { ?> +
+
+ +
+ + + + +
+ +
+ +
+ +
hasMod('wpsg_mod_produktbilder')) { ?> @@ -63,8 +128,10 @@
+
- - -
+ + +
+