Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 5692)
+++ /controller/wpsg_AdminController.class.php	(revision 5707)
@@ -1177,4 +1177,5 @@
 			
 			$arPages = array(
+				'0' => __('Keine Zuordnung', 'wpsg'),
 				'-1' => __('Neu anlegen und zuordnen', 'wpsg')
 			);
@@ -1739,4 +1740,5 @@
 				$this->createPage(__('Warenkorb', 'wpsg'), 'wpsg_page_basket', $_REQUEST['wpsg_page_basket']);				
 				$this->createPage(__('Versandkosten', 'wpsg'), 'wpsg_page_versand', $_REQUEST['wpsg_page_versand']);
+				$this->createPage(__('Produktdetail', 'wpsg'), 'wpsg_page_product', $_REQUEST['wpsg_page_product']);
 				$this->createPage(__('AGB', 'wpsg'), 'wpsg_page_agb', $_REQUEST['wpsg_page_agb']);
 				$this->createPage(__('Datenschutz', 'wpsg'), 'wpsg_page_datenschutz', $_REQUEST['wpsg_page_datenschutz']);
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 5692)
+++ /controller/wpsg_ShopController.class.php	(revision 5707)
@@ -70,4 +70,5 @@
 		const URL_REQUEST = 16;
 		const URL_LOSTPWD = 17;
+		const URL_PRODUCTDETAIL = 18;
 		
 		/** Status Konstanten */ 
@@ -138,7 +139,13 @@
 		public function the_filter($title, $id = null)
 		{
-			
-			if (wpsg_isSizedInt($id, $this->get_option('wpsg_page_basket')) && wpsg_isSizedString($_REQUEST['wpsg_action'], 'showProdukt')) return '';
-			else return $title;
+
+			if (get_the_ID() == $this->get_option('wpsg_page_basket'))
+			{
+
+				if (wpsg_isSizedInt($id, $this->get_option('wpsg_page_basket')) && wpsg_isSizedString($_REQUEST['wpsg_action'], 'showProdukt')) return '';
+
+			}
+
+			return $title;
 			
 		}
@@ -441,4 +448,9 @@
 					
 					$url = get_permalink($this->get_option('wpsg_page_basket'));					
+					break;
+
+				case self::URL_PRODUCTDETAIL:
+
+					$url = get_permalink($this->get_option('wpsg_page_product'));
 					break;
 					
@@ -1505,31 +1517,5 @@
 			{
 			
-				// Produkturl ist der zugeordnete Wordpress Artikel sollte das Produktartikel Modul es nicht spÀter Ìberschreiben
-				if ($produkt['partikel'] > 0)
-				{
-					
-					$produkt['url'] = get_permalink($produkt['partikel']);
-					
-				}
-				else
-				{
-					
-					// Damit ich immer eine Produkturl habe, habe ich hier eine Produktanzeige ÃŒber den Warenkorb realisiert
-					$basket_url = $this->getURL(wpsg_ShopController::URL_BASKET);
-					
-					if (strpos($basket_url, '?') === false)
-					{
-						
-						$produkt['url'] = $basket_url.'?wpsg_action=showProdukt&produkt_id='.$produkt['id'];
-						
-					}
-					else
-					{
-						
-						$produkt['url'] = $basket_url.'&wpsg_action=showProdukt&produkt_id='.$produkt['id'];	
-						
-					}
-				
-				}
+				$produkt['url'] = $this->getProduktLink($produkt['id']);
 				
 			}
@@ -1704,17 +1690,20 @@
 				else
 				{
-					
-					$basket_url = $this->getURL(wpsg_ShopController::URL_BASKET);
-					
-					if (strpos($basket_url, "?") > 0)
+
+					if ($this->get_option('wpsg_page_product') > 0)
+						$product_url = $this->getURL(wpsg_ShopController::URL_PRODUCTDETAIL);
+					else
+						$product_url = $this->getURL(wpsg_ShopController::URL_BASKET);
+					
+					if (strpos($product_url, "?") > 0)
 					{
-						$basket_url .= "&wpsg_action=showProdukt&produkt_id=".$produkt_id;
+						$product_url .= "&wpsg_action=showProdukt&produkt_id=".$produkt_id;
 					}
 					else
 					{
-						$basket_url .= "?wpsg_action=showProdukt&produkt_id=".$produkt_id;
+						$product_url .= "?wpsg_action=showProdukt&produkt_id=".$produkt_id;
 					}
 					
-					return $basket_url;
+					return $product_url;
 					
 				}
@@ -2424,5 +2413,12 @@
 
 			$out_content = $content;
-			
+
+			if (wpsg_isSizedInt($this->get_option('wpsg_page_product')) && $this->get_option('wpsg_page_product') == get_the_ID() && wpsg_isSizedString($_REQUEST['wpsg_action'], 'showProdukt') && wpsg_isSizedInt($_REQUEST['produkt_id']))
+			{
+
+				$content = $this->renderProdukt($_REQUEST['produkt_id']); return $content;
+
+			}
+
 			if (isset($_REQUEST['wpsg_mod']) && isset($_REQUEST['wpsg_action']) && $this->hasMod($_REQUEST['wpsg_mod']))
 			{
Index: /controller/wpsg_SystemController.class.php
===================================================================
--- /controller/wpsg_SystemController.class.php	(revision 5692)
+++ /controller/wpsg_SystemController.class.php	(revision 5707)
@@ -710,10 +710,5 @@
 			}
 			
-			if ($page_id > 0) 
-			{
-				
-				$this->update_option($page_key, $page_id);
-				
-			} 
+			$this->update_option($page_key, $page_id);
 			
 		} // private function createPage($title)
Index: /views/admin/seiten.phtml
===================================================================
--- /views/admin/seiten.phtml	(revision 5692)
+++ /views/admin/seiten.phtml	(revision 5707)
@@ -22,11 +22,12 @@
 		<?php echo wpsg_drawForm_AdminboxStart(__('Seitenkonfiguration', 'wpsg')); ?>
 			
-			<?php echo wpsg_drawForm_Select('wpsg_page_basket', __('Warenkorbseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_basket')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_page_versand', __('Versandkosten', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_versand')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_page_agb', __('AGB', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_agb')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_page_datenschutz', __('Datenschutz', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_datenschutz')); ?>				
-			<?php echo wpsg_drawForm_Select('wpsg_page_widerrufsbelehrung', __('Widerrufsbelehrung', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_widerrufsbelehrung')); ?>			
-			<?php echo wpsg_drawForm_Input('wpsg_page_onlinedisputeresolution', __('Online Streitbeilegung', 'wpsg'), $this->get_option('wpsg_page_onlinedisputeresolution')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_page_impressum', __('Impressum', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_impressum')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_page_basket', __('Warenkorbseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_basket'), array('help' => 'wpsg_page_basket')); ?>
+            <?php echo wpsg_drawForm_Select('wpsg_page_product', __('Produktdetail', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_product'), array('help' => 'wpsg_page_product')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_page_versand', __('Versandkosten', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_versand'), array('help' => 'wpsg_page_versand')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_page_agb', __('AGB', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_agb'), array('help' => 'wpsg_page_agb')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_page_datenschutz', __('Datenschutz', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_datenschutz'), array('help' => 'wpsg_page_datenschutz')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_page_widerrufsbelehrung', __('Widerrufsbelehrung', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_widerrufsbelehrung'), array('help' => 'wpsg_page_widerrufsbelehrung')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_page_onlinedisputeresolution', __('Online Streitbeilegung', 'wpsg'), $this->get_option('wpsg_page_onlinedisputeresolution'), array('help' => 'wpsg_page_onlinedisputeresolution')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_page_impressum', __('Impressum', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_impressum'), array('help' => 'wpsg_page_impressum')); ?>
 			
 		<?php echo wpsg_drawForm_AdminboxEnd(); ?>