Korrektur Produktbilder->ImageHandler

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6474 0d5edaf7-2b12-4e95-93f4-047927463d4b

8 files changed, 135 insertions, 142 deletions

diff --git a/views/mods/mod_discount/productgroups_addedit_sidebar.phtml b/views/mods/mod_discount/productgroups_addedit_sidebar.phtml
index d1bbec3..446ddb4 100644
--- a/views/mods/mod_discount/productgroups_addedit_sidebar.phtml
+++ b/views/mods/mod_discount/productgroups_addedit_sidebar.phtml
@@ -5,15 +5,9 @@
 	 */

 

 ?>

-<div id="postbox_productgrouprabatt" class="postbox">

-	<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>

-	<h3 class="handle">

-		<span><?php echo __('Produktgruppenrabatt', 'wpsg'); ?></span>

-	</h3>

-	<div class="inside">

-		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount[discount_aktiv]', __('Aktion aktiv', 'wpsg'), $this->view['wpsg_mod_discount']['data'][0]); ?>

-		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_from]', __('Start (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc(wpsg_getStr($this->view['wpsg_mod_discount']['data'][1]))); ?>

-		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_to]', __('Ende (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc(wpsg_getStr($this->view['wpsg_mod_discount']['data'][2]))); ?>

-		<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_value]', __('Rabatt', 'wpsg'), wpsg_ff(wpsg_getStr($this->view['wpsg_mod_discount']['data'][3]))); ?>

-	</div>

-</div>
\ No newline at end of file
+<?php echo wpsg_drawForm_AdminboxStart(__('Produktgruppenrabatt'));  ?>

+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_discount[discount_aktiv]', __('Aktion aktiv', 'wpsg'), $this->view['wpsg_mod_discount']['data'][0]); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_from]', __('Start (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc(wpsg_getStr($this->view['wpsg_mod_discount']['data'][1]))); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_to]', __('Ende (TT.MM.JJJJ)', 'wpsg'), wpsg_hspc(wpsg_getStr($this->view['wpsg_mod_discount']['data'][2]))); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_mod_discount[discount_value]', __('Rabatt', 'wpsg'), wpsg_ff(wpsg_getStr($this->view['wpsg_mod_discount']['data'][3]))); ?>

+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file
diff --git a/views/mods/mod_productgroups/list.phtml b/views/mods/mod_productgroups/list.phtml
index 6164440..3491629 100644
--- a/views/mods/mod_productgroups/list.phtml
+++ b/views/mods/mod_productgroups/list.phtml
@@ -9,8 +9,6 @@
 	// Produkte die neben dem Namen angezeigt werden sollen

 	$showP = 4;

 	

-	if (!$this->hasMod("wpsg_mod_produktbilder")) die(__("Dieses Template erfordert das Modul mod_produktbilder.", "wpsg"));

-

 ?>

 

 <?php $c = 0; foreach ((array)$this->view['data'] as $k => $g) { ?>

@@ -28,7 +26,7 @@
 			<div class="wpsg_pgruppen_list_image">

 				

 				<a href="<?php echo $g['produkte'][$i]['url'] ?>">

-					<?php echo wp_get_attachment_image($g['produkte'][$i]['bilder'][$image]['post_id'], 'sto_productimage_100', false, array()); ?>

+					<?php echo wp_get_attachment_image($g['produkte'][$i]['bilder'][0], 'thumbnail', false, array()); ?>

 				</a>

 				 

 			</div>

diff --git a/views/mods/mod_productgroups/show.phtml b/views/mods/mod_productgroups/show.phtml
index 7cf6529..2f6a0d0 100644
--- a/views/mods/mod_productgroups/show.phtml
+++ b/views/mods/mod_productgroups/show.phtml
@@ -6,8 +6,6 @@
 	 * 

 	 */

 

-	if (!$this->hasMod("wpsg_mod_produktbilder")) die(__("Dieses Template erfordert das Modul mod_produktbilder.", "wpsg"));

-		 

 ?>

 <div class="wpsg_pgruppen_single">

 	<div class="wpsg_pgruppen_single_produkte_wrap">

@@ -17,7 +15,7 @@
 			<?php $image = array_rand($p['bilder']); ?>			

 			<div class="wpsg_pgruppen_single_list_image">								

 				<a href="<?php echo $p['url'] ?>">

-					<?php echo wp_get_attachment_image($g['bilder'][$image]['post_id'], 'sto_productimage_555', false, array()); ?>

+					<?php echo wp_get_attachment_image($p['bilder'][0], 'medium', false, array()); ?>

 				</a>

 			</div>

 			<?php } ?>

diff --git a/views/mods/mod_productview/productview.phtml b/views/mods/mod_productview/productview.phtml
index 4e2ac50..8b58ba7 100644
--- a/views/mods/mod_productview/productview.phtml
+++ b/views/mods/mod_productview/productview.phtml
@@ -4,9 +4,9 @@
 	 * Template für die Anzeige der Produkte

 	 * Es sollte nur Inhalt unter dem Div der Klasse wpsg_productview geändert werden, da dieses mittels AJAX ausgetauscht wird 

 	 */

-

+  

 ?>

-<div class="wpsg_productview" id="wpsg_productview_<?php echo $this->view['wpsg_mod_productview']['index']; ?>">

+<span class="wpsg_productview" id="wpsg_productview_<?php echo $this->view['wpsg_mod_productview']['index']; ?>">

 	

 	<input type="hidden" name="wpsg_atts" value="<?php echo @wpsg_hspc(json_encode($this->view['wpsg_mod_productview']['atts'])); ?>" />

 	

@@ -17,6 +17,9 @@
 		<?php } ?>

 		

 		<?php if (wpsg_isSizedArray($this->view['wpsg_mod_productview']['products'])) { ?>

+		<?php $oProduct = array_values($this->view['wpsg_mod_productview']['products'])[0]; ?>

+			 

+		<?php if (!wpsg_isSizedInt($this->view['wpsg_mod_productview']['atts']['hideorder'])) { ?>

 		<div class="wpsg_mod_productview-order <?php echo $this->view['wpsg_mod_productview']['col_class']['order']; ?>">

 			<?php echo __('Sortierung', 'wpsg'); $order = $this->view['wpsg_mod_productview']['order']; ?>

 			<?php if (substr($order, -3) === 'asc') { ?>

@@ -33,9 +36,10 @@
 					<?php } ?>				

 				</div>			

 			</div>			

-		</div>

+		</div> 

+		<?php } ?>

 		

-		<div class="wpsg_mod_productview-info <?php echo $this->view['wpsg_mod_productview']['col_class']['info']; ?>">

+		<div class="wpsg_mod_productview-info <?php echo $this->view['wpsg_mod_productview']['col_class']['info']; ?> hidden-xs">

 			<strong><?php 

 				echo wpsg_translate(__('Anzeige #1# - #2#', 'wpsg'), 

 					($this->view['wpsg_mod_productview']['page'] - 1) * $this->view['wpsg_mod_productview']['per_page'] + 1, 

@@ -45,14 +49,16 @@
 		</div>

 		<?php } ?>

 

-		<div class="wpsg_mod_productview_modeswitch">

+		<?php if (!wpsg_isSizedInt($this->view['wpsg_mod_productview']['atts']['hideviewselect'])) { ?>

+		<div class="wpsg_mod_productview_modeswitch hidden-xs">

 			<a href="#" title="<?php echo __('Schaltet die Produktansicht auf die Grid Ansicht um.', 'wpsg'); ?>" class="fa fa-th <?php echo (($this->view['wpsg_mod_productview']['mode'] == 'grid')?'active':''); ?>"></a>

 			<a href="#" title="<?php echo __('Schaltet die Produktansicht auf die List Ansicht um.', 'wpsg'); ?>" class="fa fa-list <?php echo (($this->view['wpsg_mod_productview']['mode'] == 'list')?'active':''); ?>"></a>

 		</div>

+		<?php } ?>

 

 	</div>

 	

-	<div class="wpsg_productview_content row">

+	<div class="wpsg_productview_content col-2-xs-row row">

 	

 		<?php if (wpsg_isSizedArray($this->view['wpsg_mod_productview']['products'])) { ?>

 		

@@ -61,19 +67,25 @@
 			<div style="<?php echo (($this->view['wpsg_mod_productview']['mode'] == 'list')?'':'display:none;'); ?>" class="wpsg_productview_product wpsg_productview_product_list wpsg_productview_product_<?php echo $oProduct->id; ?> col-md-12">

 

 				<div class="row">

-

-					<?php $bImage = false; if ($this->hasMod('wpsg_mod_produktbilder')) { ?>

-					<?php $image_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage', array($oProduct->id, 520, 520, 'sz')); ?>

-					<?php if (wpsg_isSizedString($image_url)) { $bImage = true; ?>

-					<div class="col-md-4 wpsg_mod_productview_image">

-

-						<img src="<?php echo $image_url; ?>" alt="" />

-

+					

+					<?php 

+					

+						$attachment_id = $this->imagehandler->getAttachmentID($oProduct->getProductKey());

+											

+					?>

+											

+					<?php if (wpsg_isSizedInt($attachment_id)) { $bImage = true; ?>

+					<div class="col-md-4 col-sm-4">

+						<div class="wpsg_mod_productview_image" style="background-image:url('<?php echo $image_url; ?>');"></div>

+						

+						<div class="box_img_wrap">

+							<?php echo wp_get_attachment_image($attachment_id, 'wpsg-productview-image'); ?>

+						</div>

+						

 					</div>

 					<?php } ?>

-					<?php } ?>

 

-					<div class="col-md-<?php echo (($bImage)?'8':'12'); ?>">

+					<div class="col-md-<?php echo (($bImage)?'8':'12'); ?> col-sm-<?php echo (($bImage)?'8':'12'); ?>">

 

 						<div class="wpsg_mod_productview_name">

 							<h2><?php echo $oProduct->getProductName(); ?></h2>

@@ -85,48 +97,66 @@
 						</div>

 						<?php } ?>

 

-						<div class="wpsg_mod_productview_price_wrap">

-							<?php $oldPrice = $oProduct->getOldPrice(); ?>

-							<?php if ($oldPrice !== false && $oldPrice != $oProduct->getPrice()) { ?>

-								<div class="wpsg_mod_productview_current"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>

-								<div class="wpsg_mod_productview_oldprice"><?php echo wpsg_ff($oldPrice, $this->get_option('wpsg_currency')); ?></div>

-							<?php } else { ?>

-								<div class="wpsg_mod_productview_price"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>

-							<?php } ?>

-						</div>

-

-						<div class="wpsg_mod_productview_tax_wrap">

-							<?php if ($this->getFrontendTaxview() == WPSG_BRUTTO) { ?>

-								<?php echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>

-							<?php } else if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>

-								<?php echo wpsg_translate(__('zzgl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>

-							<?php } ?>

-						</div> 

+						<?php if ($oProduct->canDisplayPrice()) { ?>

+							<div class="wpsg_mod_productview_price_wrap">

+								<?php $oldPrice = $oProduct->getOldPrice(); ?>

+								<?php if ($oldPrice !== false && $oldPrice != $oProduct->getPrice()) { ?>

+									<div class="wpsg_mod_productview_current"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>

+									<div class="wpsg_mod_productview_oldprice"><?php echo wpsg_ff($oldPrice, $this->get_option('wpsg_currency')); ?></div>

+								<?php } else { ?>

+									<div class="wpsg_mod_productview_price"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>

+								<?php } ?>

+							</div>

+	

+							<div class="wpsg_mod_productview_tax_wrap">

+								<?php if ($this->getFrontendTaxview() == WPSG_BRUTTO) { ?>

+									<?php echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>

+								<?php } else if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>

+									<?php echo wpsg_translate(__('zzgl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>

+								<?php } ?>

+							</div>

+						<?php } else { ?>

+						<p><?php echo __('Preise werden nur für angemeldete Benutzer angezeigt.', 'wpsg'); ?></p>

+						<?php } ?>

 

 						<?php $shortDescription = $oProduct->getShortDescription(); if (wpsg_isSizedString($shortDescription)) { ?>

-						<div class="wpsg_mod_productview_description theme_color_1">

+						<div class="wpsg_mod_productview_description sto-productview-description">

 							<strong><?php echo __('Produktbeschreibung', 'wpsg'); ?></strong><br />

 							<?php echo $shortDescription; ?>

 						</div>

 						<?php } ?>

-

-						<a class="wpsg_mod_productview_button" href="<?php echo $oProduct->getProductURL(); ?>"><?php echo __('Zum Produkt', 'wpsg'); ?><span class="fa fa-angle-double-right"></span></a>

-

+						

+						<?php if ($oProduct->canOrder()) { ?>

+						<a class="sto_button sto_button_layout2 sto_button_productview_addBasket" href="<?php echo $oProduct->getProductURL(); ?>"><?php echo __('Zum Produkt', 'wpsg'); ?><span class="fa fa-angle-double-right"></span></a>

+						<?php } else { ?>

+						<a class="sto_button sto_button_soldout sto_button_layout2 sto_button_productview_addBasket" href="<?php echo $oProduct->getProductURL(); ?>"><?php echo __('Zum Produkt', 'wpsg'); ?><span class="fa fa-angle-double-right"></span></a>

+						<?php } ?>

+											

 					</div>

 

 				</div>

 

 			</div>

 

-			<div style="<?php echo (($this->view['wpsg_mod_productview']['mode'] == 'grid')?'':'display:none;'); ?>" class="<?php echo (($this->view['wpsg_mod_productview']['mode'] == 'grid')?'':'hidden'); ?> wpsg_productview_product wpsg_productview_product_grid wpsg_productview_product_<?php echo $oProduct->id; ?> <?php echo $this->view['wpsg_mod_productview']['col_class']['product']; ?>">

+			<div onclick="<?php 

+			

+				echo  'location.href = \''.$oProduct->getProductURL().'\';'; 

+			

+				?>" style="<?php echo (($this->view['wpsg_mod_productview']['mode'] == 'grid')?'':'display:none;'); ?>" class="wpsg_productview_product wpsg_productview_product_grid wpsg_productview_product_<?php echo $oProduct->id; ?> <?php echo $this->view['wpsg_mod_productview']['col_class']['product']; ?> col-xs-6">

 				

-				<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>

-				<?php $image_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage', array($oProduct->id, 520, 520, 'sz')); ?>

-				<?php if (wpsg_isSizedString($image_url)) { ?>

-				<div class="wpsg_mod_productview_image">

+				<?php 

 				

-					<img src="<?php echo $image_url; ?>" alt="" />

-					

+					$attachment_id = $this->imagehandler->getAttachmentID($oProduct->getProductKey());

+				 				

+				?>

+				

+				<?php if (wpsg_isSizedInt($attachment_id)) { ?>

+				<div class="wpsg_mod_productview_image">

+				 

+					<div class="box_img_wrap">

+						<?php echo wp_get_attachment_image($attachment_id, 'wpsg-productview-image'); ?>

+					</div>

+									

 					<div class="wpsg_mod_productview_go">

 

 						<?php if ($oProduct->rating > 0) { ?>

@@ -137,30 +167,38 @@
 

 						<div class="wpsg_center">

 						

-							<div class="wpsg_mod_productview_price_wrap">

-								<?php $oldPrice = $oProduct->getOldPrice(); ?>							

-								<?php if ($oldPrice !== false && $oldPrice != $oProduct->getPrice()) { ?>							

-									<div class="wpsg_mod_productview_oldprice"><?php echo wpsg_ff($oldPrice, $this->get_option('wpsg_currency')); ?></div>

-									<div class="wpsg_mod_productview_current"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>														

-								<?php } else { ?>

-									<div class="wpsg_mod_productview_price"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>

-								<?php } ?>

-							</div>

-							

-							<div class="wpsg_mod_productview_tax_wrap">

-								<?php if ($this->getFrontendTaxview() == WPSG_BRUTTO) { ?>

-								<?php echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>

-								<?php } else if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>

-								<?php echo wpsg_translate(__('zzgl. #1#% MwSt. zzgl. <a href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>

-								<?php } ?>

-							</div>

+							<?php if ($oProduct->canDisplayPrice()) { ?>

+								<div class="wpsg_mod_productview_price_wrap">

+																	

+									<?php $oldPrice = $oProduct->getOldPrice(); ?>							

+									<?php if ($oldPrice !== false && $oldPrice != $oProduct->getPrice()) { ?>							

+										<div class="wpsg_mod_productview_oldprice"><?php echo wpsg_ff($oldPrice, $this->get_option('wpsg_currency')); ?></div>

+										<div class="wpsg_mod_productview_current"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>														

+									<?php } else { ?>

+										<div class="wpsg_mod_productview_price"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>

+									<?php } ?>

+																	

+								</div>

+								

+								<div class="wpsg_mod_productview_tax_wrap">

+									<?php if ($this->getFrontendTaxview() == WPSG_BRUTTO) { ?>

+									<?php echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a onclick="event.stopPropagation();" href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>

+									<?php } else if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>

+									<?php echo wpsg_translate(__('zzgl. #1#% MwSt. zzgl. <a onclick="event.stopPropagation(); href="#2#">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>

+									<?php } ?>

+								</div>

+							<?php } else { ?>

+								<div class="wpsg_mod_productview_price_wrap">

+									<?php echo __('Preise werden nur für angemeldete Benutzer angezeigt.', 'wpsg'); ?>

+								</div>

+							<?php } ?>

 							

 						</div>									

 					</div>

 															

 				</div>

 				

-				<?php } } ?>

+				<?php } ?>

 				

 				<div class="wpsg_mod_productview_bottom">

 				

@@ -172,7 +210,11 @@
 						<?php echo $oProduct->shortdesc; ?>

 					</div>

 					

-					<a class="wpsg_mod_productview_button" href="<?php echo $oProduct->getProductURL(); ?>"><?php echo __('Zum Produkt', 'wpsg'); ?><span class="fa fa-angle-double-right"></span></a>

+					<?php if ($oProduct->canOrder()) { ?>

+                    <a class="sto_button sto_button_layout2 sto_button_productview_addBasket" href="<?php echo $oProduct->getProductURL(); ?>"><?php echo __('Zum Produkt', 'wpsg'); ?><span class="fa fa-angle-double-right"></span></a>

+					<?php } else { ?>

+					<a class="sto_button sto_button_soldout sto_button_layout2 sto_button_productview_addBasket" href="<?php echo $oProduct->getProductURL(); ?>"><?php echo __('Zum Produkt', 'wpsg'); ?><span class="fa fa-angle-double-right"></span></a>

+					<?php } ?>

 					 					

 				</div>

 												

@@ -190,26 +232,25 @@
 		

 		<div class="clearfix"></div>

 		

-		<?php if (wpsg_isSizedInt($this->view['wpsg_mod_productview']['pages']) && $this->view['wpsg_mod_productview']['pages'] > 1) { ?>

-		<div class="wpsg_productview_pager">

-			<div class="wpsg_productview_pager_wrap">

-				<?php if ($this->view['wpsg_mod_productview']['page'] > 1) { ?>			

-				<a href="#" title="<?php echo wpsg_translate(__('Eine Seite zurück und die vorherigen #1# Produkte anzeigen', 'wpsg'), $this->view['wpsg_mod_productview']['per_page']); ?>" onclick="return wpsg_switchProductview(<?php echo $this->view['wpsg_mod_productview']['index']; ?>, <?php echo $this->view['wpsg_mod_productview']['page'] - 1; ?>);"><span class="glyphicon glyphicon-arrow-left"></span></a>

-				<?php } ?>

-				<?php for ($i = 1; $i <= $this->view['wpsg_mod_productview']['pages']; $i ++) { ?>

-					<?php if ($i == $this->view['wpsg_mod_productview']['page']) { ?>

-					<span><?php echo $i; ?></span>

-					<?php } else { ?>

-					<a onclick="return wpsg_switchProductview(<?php echo $this->view['wpsg_mod_productview']['index']; ?>, <?php echo $i; ?>); " href="#"><?php echo $i; ?></a>

-					<?php } ?>

-				<?php } ?>

-				<?php if ($this->view['wpsg_mod_productview']['page'] < $this->view['wpsg_mod_productview']['pages']) { ?>			

-				<a href="#" title="<?php echo wpsg_translate(__('Eine Seite vor und die nächsten #1# Produkte anzeigen', 'wpsg'), $this->view['wpsg_mod_productview']['per_page']); ?>" onclick="return wpsg_switchProductview(<?php echo $this->view['wpsg_mod_productview']['index']; ?>, <?php echo $this->view['wpsg_mod_productview']['page'] + 1; ?>); "><span class="glyphicon glyphicon-arrow-right"></span></a>

-				<?php } ?>

-			</div>

-		</div>

-		<?php } ?>

-	

+		<?php 

+		

+			echo \sto\frontend\Pager::render(array(

+				'pages' => $this->view['wpsg_mod_productview']['pages'],

+				'page' => $this->view['wpsg_mod_productview']['page'],

+				'per_page' => $this->view['wpsg_mod_productview']['per_page'],

+				'margin' => 2,

+				'onclick' => array(

+					'func' => 'wpsg_switchProductview',

+					'args' => array(

+						$this->view['wpsg_mod_productview']['index'],

+						'#PAGE#'

+					)

+				)

+			));

+		

+		?>

+		 

 	</div>

-	

-</div> 
\ No newline at end of file
+

+</span> 

+

diff --git a/views/mods/mod_produktartikel/header_facebook.phtml b/views/mods/mod_produktartikel/header_facebook.phtml
deleted file mode 100644
index f8a8045..0000000
--- a/views/mods/mod_produktartikel/header_facebook.phtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php

-

-	/**

-	 * Template für die Facebook META Integration auf einer Produktseite

-	 */

-

-?>

- 

-<meta property="og:title" content="<?php echo $this->view['data']['name']; ?>" />

-<meta property="og:type" content="product" />

-<?php if ($this->hasMod('wpsg_mod_produktbilder') && isset($this->view['data']['bilder'][0])) { ?>

-<meta property="og:image" content="<?php echo $this->view['data']['bilder'][0] ?>" />

-<?php } ?>

-<meta property="og:url" content="<?php echo $this->view['data']['url']; ?>" />

-<meta property="og:description" content="<?php echo $this->view['data']['beschreibung']; ?>" />

- 
\ No newline at end of file
diff --git a/views/mods/mod_produktartikel/header_google.phtml b/views/mods/mod_produktartikel/header_google.phtml
deleted file mode 100644
index 9d21a7a..0000000
--- a/views/mods/mod_produktartikel/header_google.phtml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php

-

-	/**

-	 * Template für die Header Daten bei Google+ Einbindung

-	 */

-

-?>

- 

-<meta itemprop="name" content="<?php echo $this->view['data']['name']; ?>" />

-<meta itemprop="description" content="<?php echo $this->view['data']['beschreibung']; ?>" />

-<meta itemprop="url" content="<?php echo $this->view['data']['url']; ?>" />

-<meta itemprop="image" content="<?php echo $this->view['data']['bilder'][0] ?>" />

- 
\ No newline at end of file
diff --git a/views/mods/mod_produktartikel/schemaorg.phtml b/views/mods/mod_produktartikel/schemaorg.phtml
index daa8294..718ee80 100644
--- a/views/mods/mod_produktartikel/schemaorg.phtml
+++ b/views/mods/mod_produktartikel/schemaorg.phtml
@@ -8,7 +8,7 @@
 ?> 

 <div itemscope itemtype="http://schema.org/Product" style="display:none;">

 	<span itemprop="name"><?php echo wpsg_hspc($this->view['data']['name']); ?></span>

-	<img itemprop="image" src="<?php echo $this->view['data']['bilder'][0] ?>" />

+	<img itemprop="image" src="<?php echo wp_get_attachment_image($this->view['data']['bilder'][0], 'medium'); ?>" />

 	<a itemprop="url" href="<?php echo $this->view['data']['url']; ?>"><?php echo $this->view['data']['name']; ?></a>

 	<div itemprop="description"><?php echo $this->view['data']['beschreibung']; ?></div>

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_produktartikel/settings_edit.phtml b/views/mods/mod_produktartikel/settings_edit.phtml
index d59b658..170b150 100644
--- a/views/mods/mod_produktartikel/settings_edit.phtml
+++ b/views/mods/mod_produktartikel/settings_edit.phtml
@@ -8,9 +8,7 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel_pathkey', __('Path Key', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_pathkey'), array('help' => 'mod_produktartikel_pathkey')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showui', __('Custom Post Type in Wordpress Menü sichtbar', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showui'), array('help' => 'wpsg_mod_produktartikel_showui'))?>

 

-<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_postthumbnail', __('Produktbild als Beitragsbild übergeben', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_postthumbnail'), array('help' => 'wpsg_mod_produktartikel_postthumbnail')); ?>

-<?php } ?>

 

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showHome', __('Direkt auf Startseitenansicht anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showHome'), array('help' => 'wpsg_mod_produktartikel_showHome')); ?>

 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showCategory', __('Direkt in den Kategorieansichten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showCategory'), array('help' => 'wpsg_mod_produktartikel_showCategory')); ?>

@@ -112,10 +110,3 @@
 	

 	/* ]]> */</script>

 	<?php } ?>

-

-<br />

-

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_facebook', __('Facebook Integration', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_facebook'), array('help' => 'wpsg_mod_produktartikel_facebook')); ?>

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_google', __('Google+ Integration', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_google'), array('help' => 'wpsg_mod_produktartikel_google')); ?>

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_twitter', __('Twitter Integration', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_twitter'), array('help' => 'wpsg_mod_produktartikel_twitter')); ?>

- 
\ No newline at end of file