Index: /controller/wpsg_ProduktController.class.php
===================================================================
--- /controller/wpsg_ProduktController.class.php	(revision 5386)
+++ /controller/wpsg_ProduktController.class.php	(revision 5391)
@@ -632,4 +632,5 @@
 				 
 				$data['preis'] = wpsg_tf($_REQUEST['preis']);
+				$data['oldprice'] = wpsg_tf($_REQUEST['oldprice']);
 				 			
 				$this->shop->callMods('produkt_save_before', array(&$data));
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 5386)
+++ /controller/wpsg_ShopController.class.php	(revision 5391)
@@ -643,6 +643,11 @@
 				wp_enqueue_script('jquery-ui-datepicker-de', $this->url(WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/ui/jquery.ui.datepicker-de.js'), array('jquery', 'jquery-ui-core'));
 			
-				wp_enqueue_style('wpsg-bscss', $GLOBALS['wpsg_sc']->getRessourceURL('js/bootstrap-3.3.6-dist/css/bootstrap.css'));
-				wp_enqueue_style('wpsg-bs-theme-css', $GLOBALS['wpsg_sc']->getRessourceURL('js/bootstrap-3.3.6-dist/css/bootstrap-theme.css'));
+				if (in_array(wpsg_getStr($_REQUEST['page']), array('wpsg-Admin', 'wpsg-Produkt')))
+				{
+				
+					wp_enqueue_style('wpsg-bscss', $GLOBALS['wpsg_sc']->getRessourceURL('js/bootstrap-3.3.6-dist/css/bootstrap.css'));
+					wp_enqueue_style('wpsg-bs-theme-css', $GLOBALS['wpsg_sc']->getRessourceURL('js/bootstrap-3.3.6-dist/css/bootstrap-theme.css'));
+					
+				}
 				
 				wp_enqueue_style('wpsg-adminstyle', $GLOBALS['wpsg_sc']->getRessourceURL('css/admin.css'), array('wpsg-bscss', 'wpsg-bs-theme-css'));
Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php	(revision 5386)
+++ /lib/filter_functions.inc.php	(revision 5391)
@@ -412,4 +412,6 @@
 		array_push($buttons, '|', 'wpsg');
 
+		$GLOBALS['wpsg_sc']->callMods('tinymce_button', array(&$buttons));
+		
 		return $buttons;
 		
@@ -419,4 +421,11 @@
 	{
 
+		if (wpsg_getStr($_REQUEST['page']) != 'wpsg-Produkt')
+		{
+					
+			$GLOBALS['wpsg_sc']->callMods('tinymce_plugin', array(&$plugin_array));
+			
+		}
+		
 		$plugin_array['wpsg'] = WPSG_URL.'/views/js/mce_plugin.js';
 	
Index: /lib/helper_functions.inc.php
===================================================================
--- /lib/helper_functions.inc.php	(revision 5386)
+++ /lib/helper_functions.inc.php	(revision 5391)
@@ -631,5 +631,5 @@
 	function wpsg_drawForm_Input($field_name, $field_label, $field_value, $conf = array())
 	{
-		
+				
 		$TC = new wpsg_ShopController();
 		
@@ -887,4 +887,12 @@
 		$TC->view['field_values'] = $field_values;
 		$TC->view['field_config'] = $conf;
+		$TC->view['atts_select'] = '';
+		
+		if (wpsg_isSizedInt($conf['multiple']))
+		{
+		
+			$TC->view['atts_select'] .= ' size="'.$conf['multiple'].'" multiple=""multiple" ';
+			
+		}
 		
 		return $TC->render(WPSG_PATH_VIEW.'admin/form/select.phtml', false);
Index: /lib/install.php
===================================================================
--- /lib/install.php	(revision 5386)
+++ /lib/install.php	(revision 5391)
@@ -33,4 +33,5 @@
 	  	typ VARCHAR(100) NOT NULL, 
 	  	preis DOUBLE(10,2) NOT NULL,
+		oldprice DOUBLE(10,2) NOT NULL,
 		mwst_key VARCHAR(1) NOT NULL,
 	  	beschreibung longtext NOT NULL,
Index: /model/wpsg_product.class.php
===================================================================
--- /model/wpsg_product.class.php	(revision 5386)
+++ /model/wpsg_product.class.php	(revision 5391)
@@ -169,8 +169,11 @@
 		} // public function getProductURL()
 		 
+		/**
+		 * Gibt den Alten Preis fÃŒr das Frontend zurÃŒck
+		 */
 		public function getOldPrice()
 		{
 		
-			return 2100;
+			return wpsg_tf($this->oldprice);
 			
 		}
@@ -183,8 +186,11 @@
 		}
 		
+		/**
+		 * Gibt den Preis fÃŒr das Frontend zurÃŒck
+		 */
 		public function getPrice()
 		{
 			
-			return 15;
+			return wpsg_tf($this->price);
 			
 		}
@@ -272,5 +278,5 @@
 		{
 		
-			list($strQueryWHERE, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
+			list($strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
 		
 			$strQuery = "
@@ -279,12 +285,15 @@
 				FROM
 					`".WPSG_TBL_PRODUCTS."` AS P
+						".$strQueryJOIN."
 				WHERE
 					1
 					".$strQueryWHERE."
+				GROUP BY
+					P.`id`
 				HAVING
 					1
-					".$strQueryHAVING."
+					".$strQueryHAVING."				
 				ORDER BY
-					".$strQueryORDER."
+					".$strQueryORDER."				
 			";
 				
@@ -308,4 +317,5 @@
 		
 			$strQueryWHERE = "";
+			$strQueryJOIN = "";
 			$strQueryHAVING = "";
 			$strQueryORDER = " P.`cdate` ASC ";
@@ -314,9 +324,26 @@
 			{
 				 
-				$strQueryWHERE .= " AND P.`id` IN (".implode(',', $arFilter['product_ids']).") ";
-				
-			}
-			
-			return array($strQueryWHERE, $strQueryHAVING, $strQueryORDER);
+				$strQueryWHERE .= " AND P.`id` IN (".wpsg_q(implode(',', $arFilter['product_ids'])).") ";
+				
+			}
+			
+			if (wpsg_isSizedArray($arFilter['productgroup_ids']))
+			{
+				
+				$strQueryWHERE .= " AND P.`pgruppe` IN (".wpsg_q(implode(',', $arFilter['productgroup_ids'])).") ";
+				
+			}
+			
+			if (wpsg_isSizedArray($arFilter['cat_ids']))
+			{
+				
+				$strQueryJOIN .= " LEFT JOIN `".wpsg_q($GLOBALS['wpsg_sc']->prefix.'posts')."` AS POST ON (POST.`wpsg_produkt_id` = P.`id`) ";
+				$strQueryJOIN .= " LEFT JOIN `".wpsg_q($GLOBALS['wpsg_sc']->prefix.'term_relationships')."` AS PCAT ON (POST.`ID` = PCAT.`object_id`) ";
+				
+				$strQueryWHERE .= " AND PCAT.`term_taxonomy_id` IN (".wpsg_q(implode(',', $arFilter['cat_ids'])).") ";
+				
+			}
+			
+			return array($strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER);
 		
 		} // public function getQueryParts($arFilter = array())
Index: /mods/wpsg_mod_basic.class.php
===================================================================
--- /mods/wpsg_mod_basic.class.php	(revision 5386)
+++ /mods/wpsg_mod_basic.class.php	(revision 5391)
@@ -146,4 +146,10 @@
 		public function be_ajax() { }
 		
+		/** FÃŒr das hinzufÃŒgen von Buttons zum RTE */
+		public function tinymce_plugin(&$plugin_array) { }
+		
+		/** Button fÃŒr den TinyMCE */
+		public function tinymce_button(&$buttons) { }
+		
 		/** Integriert sich in die Bestellzusammenfassung (overview.phtml) nach der AGB */
 		public function overview_top(&$arBasket) { }
Index: /mods/wpsg_mod_productview.class.php
===================================================================
--- /mods/wpsg_mod_productview.class.php	(revision 5386)
+++ /mods/wpsg_mod_productview.class.php	(revision 5391)
@@ -29,4 +29,31 @@
 		} // public function init()
 
+		public function produkt_ajax()
+		{
+			
+			$this->shop->view['arSelect'] = ['-1' => __('Alle Produkte', 'wpsg'), '0' => __('Manuelle Produktauswahl')];
+			$this->shop->view['arProductgroups'] = [];
+			$this->shop->view['arCategories'] = [];
+			
+			if ($this->shop->hasMod('wpsg_mod_productgroups'))
+			{
+				
+				$this->shop->view['arSelect'][9] = __('Produktgruppenauswahl', 'wpsg');
+				$this->shop->view['arProductgroups'] = (array)$this->shop->callMod('wpsg_mod_productgroups', 'getAllProductGroups'); 			
+				
+			}
+			
+			if ($this->shop->hasMod('wpsg_mod_produktartikel'))
+			{
+				
+				$this->shop->view['arSelect'][15] = __('Produktkategorien', 'wpsg');
+				$this->shop->view['arCategories'] = (array)$this->shop->callMod('wpsg_mod_produktartikel', 'getCategorySelectArray');
+				
+			}
+			
+			die($this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productview/shortcodegenerator.phtml'));
+			
+		} // public function produkt_ajax()
+		
 		public function wpsg_enqueue_scripts()
 		{
@@ -36,12 +63,27 @@
 					
 				wp_enqueue_script('wpsg_mod_productview_js', $this->shop->getRessourceURL('mods/mod_productview/productview.js'));
-				
-				wp_localize_script('wpsg_mod_productview_js', 'wpsg_mod_productview', array(
-					 				
-				));
-		
+				 		
 			}
 				
 		} // public function wpsg_enqueue_scripts()
+		
+		public function tinymce_button(&$buttons) 
+		{ 
+		
+			array_push($buttons, '|', 'wpsgModProductviewPlugin');
+			
+		}
+		
+		public function tinymce_plugin(&$plugin_array) 
+		{ 
+			
+			if (wpsg_getStr($_REQUEST['page']) != 'wpsg-Produkt')
+			{
+			
+				$plugin_array['wpsgModProductviewPlugin'] = $this->shop->getRessourceURL('mods/mod_productview/mce_plugin.js');
+				
+			}
+			
+		} // public function tinymce_plugin($plugin_array)
 		
 		/* Modulfunktionen */
@@ -87,10 +129,23 @@
 			if (wpsg_isSizedString($atts['product_ids']))
 			{
-			
-				$arReturn = array_merge($arReturn, explode(',', $atts['product_ids']));
-				$arReturn = wpsg_trim(array_unique($arReturn));
-					
+			 
 				$arFilter = array(
-					'product_ids' => $arReturn
+					'product_ids' => wpsg_trim(array_unique(explode(',', $atts['product_ids'])))
+				);
+				
+			}
+			else if (wpsg_isSizedString($atts['productgroup_ids']))
+			{
+				
+				$arFilter = array(
+					'productgroup_ids' => wpsg_trim(array_unique(explode(',', $atts['productgroup_ids'])))
+				);
+				
+			}
+			else if (wpsg_isSizedString($atts['cat_ids']))
+			{
+				
+				$arFilter = array(
+					'cat_ids' => wpsg_trim(array_unique(explode(',', $atts['cat_ids'])))
 				);
 				
Index: /views/admin/form/checkbox.phtml
===================================================================
--- /views/admin/form/checkbox.phtml	(revision 5386)
+++ /views/admin/form/checkbox.phtml	(revision 5391)
@@ -16,3 +16,5 @@
 	</div>
 	
+	<div class="clearfix wpsg_clear"></div>
+	
 </div>
Index: /views/admin/form/input.phtml
===================================================================
--- /views/admin/form/input.phtml	(revision 5386)
+++ /views/admin/form/input.phtml	(revision 5391)
@@ -7,3 +7,5 @@
 	</div>
 	
+	<div class="clearfix wpsg_clear"></div>
+	
 </div>
Index: /views/admin/form/select.phtml
===================================================================
--- /views/admin/form/select.phtml	(revision 5386)
+++ /views/admin/form/select.phtml	(revision 5391)
@@ -5,5 +5,5 @@
 	<div class="col-sm-6">
 		
-		<select id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>" class="form-control input-sm">
+		<select id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>" class="form-control input-sm" <?php echo $this->view['atts_select']; ?>>
 			<?php foreach ($this->view['field_values'] as $k => $v) { ?>
 			<option <?php echo (($k == $this->view['field_value'])?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($k); ?>"><?php echo wpsg_hspc($v); ?></option>
@@ -13,3 +13,5 @@
 	</div>
 	
+	<div class="clearfix wpsg_clear"></div>
+	
 </div>
Index: /views/admin/konfiguration.phtml
===================================================================
--- /views/admin/konfiguration.phtml	(revision 5386)
+++ /views/admin/konfiguration.phtml	(revision 5391)
@@ -87,5 +87,4 @@
 		<?php echo wpsg_drawForm_TextEnd(__('Installierte DB Version', 'wpsg')); ?>	
 		<?php } ?>
-		<br />
 		
 		<?php echo wpsg_drawForm_Input('wpsg_currency', __('WÃ€hrung', 'wpsg'), $this->get_option('wpsg_currency'), array('help' => 'Einstellungen_Allgemein_Waehrung')); ?>
Index: /views/css/admin.css
===================================================================
--- /views/css/admin.css	(revision 5386)
+++ /views/css/admin.css	(revision 5391)
@@ -1,3 +1,6 @@
 /* Allgemein */
+.wpsg_clear { clear:both; }
+
+/* Bootstrap Teil */
 #wpsg-bs { margin-top:20px; }
 #wpsg-bs nav.navbar { margin-right:20px; } 
@@ -9,4 +12,30 @@
 #wpsg-bs .pagination { margin-top:0px; margin-bottom:10px; }
 #wpsg-bs .content { width:100%; box-sizing:border-box; padding-right:20px; }
+#wpsg-bs .form-group { margin-bottom:5px; margin-top:5px; }
+#wpsg-bs .form-checkbox { margin-top:-5px; margin-bottom:0px; }
+
+/* Bootstrap Formulare im alten Teil */
+.wpsg_old_forms .form-group { margin-left:-15px; margin-right:-15px; margin-bottom:5px; } 
+.wpsg_old_forms .form-checkbox > div:first-child { width:100%; margin-left:0px; }
+
+/* Auswahl der Versand-/Zahlungsarten */
+
+#wpsg_shippingmethods_select,
+#wpsg_paymentmethods_select { margin-bottom:10px; }
+.wpsg_shippingmethods_select .checkbox,
+.wpsg_paymentmethods_select .checkbox { margin-top:0px; margin-bottom:0px; }
+
+/* Alte Formularelemente */
+.wpsg_form_field { width:100%; margin-bottom:5px; }
+.wpsg_form_field_fullrow { position:relative; }
+.wpsg_form_field_fullrow label { font-weight:bold; line-height:25px; }
+.wpsg_form_field .wpsg_form_left { line-height:24px; font-weight:bold; width:50%; float:left; }
+.wpsg_form_field .wpsg_form_right { width:50%; padding-left:15px; float:left; position:relative; }
+.wpsg_form_field .wpsg_form_right select, .wpsg_form_field .wpsg_form_right input, .wpsg_form_field .wpsg_form_right textarea { width:95%; }
+.wpsg_form_field .wpsg_form_right input.button { width:auto; }
+.wpsg_form_field .wpsg_form_right input[type="checkbox"] { margin-top:-4px; margin-right:5px; }
+.wpsg_form_field .wpsg_form_right label { line-height:25px; }
+.wpsg_form_field .wpsg_form_right p { padding-top:5px; }
+.wpsg_form_field_max select { width:100%; }
 
 /* Konfiguration */
Index: /views/css/frontend.css
===================================================================
--- /views/css/frontend.css	(revision 5386)
+++ /views/css/frontend.css	(revision 5391)
@@ -321,4 +321,8 @@
 .wpsg_productview_head h2.wpsg_productview_title { margin-top:0px; font-size:20px; font-weight:bold; color:#0E2F42; }
 .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_image img { max-width:100%; height:auto; border:1px solid #E4F3F8; }
 .wpsg_productview_pager { width:100%; border-top:1px solid #E4F3F8; border-bottom:1px solid #E4F3F8; margin-bottom:25px; margin-top:10px; padding-top:25px; padding-bottom:25px; text-align:center; }
@@ -338,4 +342,5 @@
 .wpsg_productview_product:hover .wpsg_mod_productview_go { display:block; }
 .wpsg_mod_productview_loading { width:100%; height:100%; background-color:rgba(255, 255, 255, 0.5); position:absolute; left:0px; top:0px; }
+ 
   
 @media screen and (max-width: 600px) {
Index: /views/mods/mod_productgroups/produkt_edit_sidebar.phtml
===================================================================
--- /views/mods/mod_productgroups/produkt_edit_sidebar.phtml	(revision 5386)
+++ /views/mods/mod_productgroups/produkt_edit_sidebar.phtml	(revision 5391)
@@ -16,7 +16,7 @@
 		<p><?php echo __('Bisher wurden keine Produktgruppen angelegt.', 'wpsg'); ?></p>
 		<?php } else { ?>
-		<?php echo wpsg_drawForm_Select('wpsg_productgroup', __('Produktgruppe', 'wpsg'), $this->view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_von', __('Sticky von', 'wpsg'), $this->view['wpsg_mod_productgroups']['sticky_von']); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_bis', __('Sticky bis', 'wpsg'), $this->view['wpsg_mod_productgroups']['sticky_bis']); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_productgroup', __('Produktgruppe', 'wpsg'), @$this->view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_von', __('Sticky von', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_von']); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_bis', __('Sticky bis', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_bis']); ?>
 		<?php } ?>
 		
Index: /views/mods/mod_productview/mce_plugin.js
===================================================================
--- /views/mods/mod_productview/mce_plugin.js	(revision 5391)
+++ /views/mods/mod_productview/mce_plugin.js	(revision 5391)
@@ -0,0 +1,46 @@
+(function() {
+ 
+	tinymce.create('tinymce.plugins.wpsgModProductviewPlugin', {
+		
+		init : function(ed, url) {
+ 
+			ed.addCommand('mcewpsg2', function() {
+				ed.windowManager.open({
+					file : 'admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_productview&noheader=1',
+					title: 'Produktansicht generieren',
+					width : 450,
+					height : 450,
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+ 
+			ed.addButton('wpsgModProductviewPlugin', {
+				title : 'Produkte ÃŒber die Produktansicht anzeigen',
+				cmd : 'mcewpsg2',
+				image : url + '/../../gfx/table.png'
+			});
+ 
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('wpsgModProductviewPlugin', n.nodeName == 'IMG');
+			});
+		},
+ 
+		createControl : function(n, cm) {
+			return null;
+		},
+ 
+		getInfo : function() {
+			return {
+				longname : 'wpShopGermany Produktauswahl',
+				author : 'maennchen1.de',
+				authorurl : 'http://maennchen1.de',
+				version : "3.0"
+			};
+		}
+	});
+
+	tinymce.PluginManager.add('wpsgModProductviewPlugin', tinymce.plugins.wpsgModProductviewPlugin);
+	
+})();
Index: /views/mods/mod_productview/productview.phtml
===================================================================
--- /views/mods/mod_productview/productview.phtml	(revision 5386)
+++ /views/mods/mod_productview/productview.phtml	(revision 5391)
@@ -15,5 +15,6 @@
 		<?php if (wpsg_isSizedArray($this->view['wpsg_mod_productview']['products'])) { ?>
 		<div class="col-lg-3 wpsg_mod_productview-order">
-			asd
+			<?php echo __('Sortierung', 'wpsg'); ?><span class="glyphicon glyphicon-menu-down"></span>
+			<strong>Neueste zuerst</strong>
 		</div>
 		
Index: /views/mods/mod_productview/shortcodegenerator.phtml
===================================================================
--- /views/mods/mod_productview/shortcodegenerator.phtml	(revision 5391)
+++ /views/mods/mod_productview/shortcodegenerator.phtml	(revision 5391)
@@ -0,0 +1,114 @@
+<?php
+
+	/**
+	 * Template fÃŒr die Produktauswahl ÃŒber den RTE
+	 */
+
+?>
+<html>
+	<head>
+		<title><?php echo __('Produktansicht generieren', 'wpsg'); ?></title>
+	
+		<script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl'); ?>/wp-includes/js/jquery/jquery.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl'); ?>/wp-includes/js/tinymce/tiny_mce_popup.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl'); ?>/wp-includes/js/tinymce/utils/mctabs.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl'); ?>/wp-includes/js/tinymce/utils/form_utils.js"></script>
+		
+		<link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-content/plugins/wpshopgermany/views/js/bootstrap-3.3.6-dist/css/bootstrap.css" type="text/css" media="all" />
+		<link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-content/plugins/wpshopgermany/views/js/bootstrap-3.3.6-dist/css/bootstrap-theme.css" type="text/css" media="all" />
+	</head>
+	<body>
+	 
+		<div style="padding-top:15px; font-size:12px;" class="form-horizontal">
+		
+			<div class="container-fluid">
+			
+				<?php echo wpsg_drawForm_Input('title', __('Titel', 'wpsg'), ''); ?>
+				<?php echo wpsg_drawForm_Select('showswitch', __('Anzeige', 'wpsg'), $this->view['arSelect'], '-1'); ?>
+					
+				<div class="showswitch showswitch_0" style="display:none;">
+					<?php echo wpsg_drawForm_Input('product_ids', __('Produkte (IDs kommagetrennt)', 'wpsg'), ''); ?>
+				</div>
+					
+				<div class="showswitch showswitch_9" style="display:none;">
+					<?php echo wpsg_drawForm_Select('pg_ids', __('Produktgruppen (Mehrfachauswahl mit STRG)', 'wpsg'), $this->view['arProductgroups'], '', array('multiple' => 8)); ?>
+				</div>
+				
+				<div class="showswitch showswitch_15" style="display:none;">
+					<?php echo wpsg_drawForm_Select('pg_cat', __('Produktkategorien (Mehrfachauswahl mit STRG)', 'wpsg'), $this->view['arCategories'], '', array('multiple' => 8)); ?>
+				</div>
+				
+			</div>
+			
+			<input onclick="return insertSC();" style="margin:15px; width:auto; display:block; padding:3px 10px 3px 10px; box-sizing:border-box;" type="button" value="<?php echo __('Shortcode einfÃŒgen', 'wpsg'); ?>" />			
+		
+			<script type="text/javascript">/* <![CDATA[ */
+
+				function insertSC()
+				{
+
+					var text = "[wpsg_productview ";
+
+					if (jQuery('#title').val().length > 0) text += ' title="' + jQuery('#title').val() + '"';
+					if (jQuery('#showswitch').val() == '-1') text += ' product="-1"'; 							
+					else if (jQuery('#showswitch').val() == '0') text += ' product="' + jQuery('#product_ids').val() + '"';
+					else if (jQuery('#showswitch').val() == '9') 
+					{
+
+						text += ' productgroup_ids="'; var arIDs = [];
+						jQuery('#pg_ids option:selected').each(function() { arIDs.push(jQuery(this).val()); } );
+						text += arIDs.join(',') + '"';
+						
+					}
+					else if (jQuery('#showswitch').val() == '15') 
+					{
+
+						text += ' cat_ids="'; var arIDs = [];
+						jQuery('#pg_cat option:selected').each(function() { arIDs.push(jQuery(this).val()); } );
+						text += arIDs.join(',') + '"';
+						
+					}
+					
+					text += "]";
+										
+					if (window.tinyMCE)
+					{
+
+						<?php if (get_bloginfo('version') < 3.9) { ?>
+							
+						window.tinyMCE.execInstanceCommand("content", "mceInsertContent", false, text);
+						tinyMCEPopup.editor.execCommand("mceRepaint");			
+							
+						<?php } else { ?>
+
+						parent.tinyMCE.execCommand('mceInsertContent', false, text);
+						parent.tinyMCE.activeEditor.windowManager.close();
+							
+						<?php } ?>
+														
+										
+						tinyMCEPopup.close();
+																				
+					}
+					
+					return false;
+					
+				}
+            
+				jQuery(document).ready(function() {
+
+					jQuery('#showswitch').bind('change', function() {
+ 
+						jQuery('.showswitch').hide();
+						jQuery('.showswitch_' + jQuery(this).val()).show();
+						
+					} ).change();
+					
+				} );
+			 
+			/* ]]> */</script>
+		
+		</div>
+		
+	</body>
+</html>
Index: /views/mods/mod_produktartikel/produkt_edit_sidebar.phtml
===================================================================
--- /views/mods/mod_produktartikel/produkt_edit_sidebar.phtml	(revision 5386)
+++ /views/mods/mod_produktartikel/produkt_edit_sidebar.phtml	(revision 5391)
@@ -11,18 +11,7 @@
 		<span><?php echo __('Produktartikel', 'wpsg'); ?> </span>
 	</h3>
-	<div class="inside">		
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<label for="wpsg_produktartikel_kommentare"><?php echo __('Kommentare', 'wpsg'); ?>:</label>
-			</div>
-			<div class="wpsg_form_right">
-				<input id="wpsg_produktartikel_kommentare" type="checkbox"
-					class="checkbox" name="wpsg_mod_produktartikel[kommentare]"
-					value="1"
-					<?php echo (($this->view['data']['comment_status'] == 'open')?'checked="checked"':''); ?> />
-			</div>
-			<div class="wpsg_clear"></div>
-		</div>
-		<?php echo wpsg_drawForm_Input('wpsg_produktartikel_menuorder', __('Position', 'wpsg'), $this->view['data']['menu_order']); ?>
+	<div class="inside">
+		<?php echo wpsg_drawForm_Input('wpsg_produktartikel_menuorder', __('Position', 'wpsg'), @$this->view['data']['menu_order']); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel[kommentare]', __('Kommentare', 'wpsg'), @$this->view['data']['comment_status']); ?>
 	</div>
 </div>
@@ -36,5 +25,5 @@
 			<div id="category-all" class="tabs-panel">
 				<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-					<?php wp_terms_checklist($this->view['data']['post_id'], array('taxonomy' => 'category')); ?>
+					<?php wp_terms_checklist(@$this->view['data']['post_id'], array('taxonomy' => 'category')); ?>
 				</ul>
 			</div>
Index: /views/produkt/addedit.phtml
===================================================================
--- /views/produkt/addedit.phtml	(revision 5386)
+++ /views/produkt/addedit.phtml	(revision 5391)
@@ -7,240 +7,259 @@
 
 ?>
-<script type="text/javascript">/* <![CDATA[ */
 
-	wpsg_product_edit_change = new Array();
-	                                            
-	jQuery(document).ready( function() {
+<div class="wpsg_products wpsg_old_forms" id="wpsg-bs">
+
+	<nav class="navbar navbar-default">
+		<div class="container-fluid">
+			<div class="navbar-header">
+				<a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>
+			</div>
+			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+				<ul class="nav navbar-nav">
+					<li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt"><?php echo __("ProduktÃŒbersicht", "wpsg"); ?></a></li>
+					<li role="presentation" class="wpsg_showhide_filter active"><a href="#" onclick="return false;"><?php echo __("Produktbearbeitung", "wpsg"); ?></a></li>
+				</ul>
+			</div>
+		</div>
+	</nav>
+
+	<script type="text/javascript">/* <![CDATA[ */
+	
+		wpsg_product_edit_change = new Array();
+		                                            
+		jQuery(document).ready( function() {
+			
+		    jQuery('.wpsg_form_help').tipTip();
+	
+		    jQuery("#normal-sortables, #side-sortables").sortable({
+				connectWith: ".meta-box-sortables",
+				placeholder: 'wpsg_placeholder',
+				dropOnEmpty: true, 
+				cursor: 'move',
+				grid: [50, 20],
+				handle: '.wpsg_handlediv',
+				forceHelperSize: true,
+				forcePlaceholderSize: true,
+				opacity: 0.8,
+				stop: function(e,ui) {
+	
+					var ser = jQuery("#normal-sortables").sortable("serialize");				
+					ser = ser.replace(/\&wpsg\[\]\=/g, ',').replace(/wpsg\[\]\=/g, '');
+	
+					jQuery.cookie('wpsg_product_view_normal', ser);
+	
+					var ser = jQuery("#side-sortables").sortable("serialize");								
+					ser = ser.replace(/\&wpsg\[\]\=/g, ',').replace(/wpsg\[\]\=/g, '');
+					
+					jQuery.cookie('wpsg_product_view_side', ser);
+					
+				},
+				receive: function(e, ui) {
+				}
+			}); 
+	
+		    if (jQuery.cookie('wpsg_product_view_normal') != null)
+			{
+	
+				var divs = jQuery.cookie('wpsg_product_view_normal').split(',').reverse();
+	
+				for (index in divs)
+				{
+	
+					jQuery('#normal-sortables').prepend(jQuery('#wpsg_' + divs[index]));
+					
+				}
+				
+			}
+	
+			if (jQuery.cookie('wpsg_product_view_side') != null)
+			{
+	
+				var divs = jQuery.cookie('wpsg_product_view_side').split(',').reverse();
+	
+				for (index in divs)
+				{
+	
+					jQuery('#side-sortables').prepend(jQuery('#wpsg_' + divs[index]));
+					
+				}
+				
+			}
+	
+			var click_x = false;
+			var click_y = false;
+			
+			jQuery('.wpsg_handlediv').bind('click', function(ev) {
+	
+				if (Math.abs(click_x - ev.pageX) <= 5 && Math.abs(click_y - ev.pageY) <= 5)
+				{
+	
+					jQuery(this).next().toggle();
+	
+					var arClose = new Array();
+					jQuery('.wpsg_product_view .postbox .inside:hidden').each(function() {
+						arClose.push(jQuery(this).parent().attr("id"));
+					} );
+	
+					jQuery.cookie('wpsg_product_closed', arClose.join(','));
+						
+				}
+				
+			} );
+			
+			jQuery('.wpsg_handlediv').bind('mousedown', function(ev) {
+	
+				click_x = ev.pageX;
+				click_y = ev.pageY;	
+							
+			} );
+	
+			if (jQuery.cookie('wpsg_product_closed') != null && jQuery.cookie('wpsg_product_closed') != '')
+			{
+	
+				var arClose = jQuery.cookie('wpsg_product_closed').split(',');
+	
+				for (index in arClose)
+				{
+	
+					jQuery('#' + arClose[index] + ' .inside').hide();
+								
+				}
+				
+			}
+	
+			jQuery('#submit, #submit_index').bind('click', function() {
+	
+				if (wpsg_product_edit_change.length > 0)
+				{
+	
+					jQuery('.wpsg_change_error').removeClass('wpsg_change_error');
+					
+				    for (var i = 0; i < wpsg_product_edit_change.length; i++) {
+				    	 
+				        jQuery('#' + wpsg_product_edit_change[i]).addClass('wpsg_change_error');
+				        
+				    }
+	
+				    alert('<?php echo __('Bitte ÃŒberprÃŒfen Sie die rot markierten Felder. Ãnderungen in diesen Feldern gehen beim Speichern verloren.', 'wpsg'); ?>');
+	
+				    return false;
+					
+				}
+				else
+				{
+	
+					return true;
+					
+				}
+				
+			} );
+			
+			// Flaggen fÃŒr die aktuelle Sprache davorbauen
+			<?php if ($this->isMultiLingual() && isset($_REQUEST['wpsg_lang'])) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$_REQUEST['wpsg_lang']]; ?>
+			jQuery('.wpsg_handlediv').prepend('<img src="<?php echo $this->getFlagURL().$lang['flag']; ?>" alt="<?php echo $lang['name']; ?>" />&nbsp;');
+			<?php } ?>
+		    
+		} );
+	             
+	/* ]]> */</script> 
+	
+	<?php echo $this->writeBackendMessage(); ?>
+	
+	<div class="wrap columns-2 wpsg_produkt_addedit wpsg_product_view" id="wpsg_product_view">
 		
-	    jQuery('.wpsg_form_help').tipTip();
-
-	    jQuery("#normal-sortables, #side-sortables").sortable({
-			connectWith: ".meta-box-sortables",
-			placeholder: 'wpsg_placeholder',
-			dropOnEmpty: true, 
-			cursor: 'move',
-			grid: [50, 20],
-			handle: '.wpsg_handlediv',
-			forceHelperSize: true,
-			forcePlaceholderSize: true,
-			opacity: 0.8,
-			stop: function(e,ui) {
-
-				var ser = jQuery("#normal-sortables").sortable("serialize");				
-				ser = ser.replace(/\&wpsg\[\]\=/g, ',').replace(/wpsg\[\]\=/g, '');
-
-				jQuery.cookie('wpsg_product_view_normal', ser);
-
-				var ser = jQuery("#side-sortables").sortable("serialize");								
-				ser = ser.replace(/\&wpsg\[\]\=/g, ',').replace(/wpsg\[\]\=/g, '');
-				
-				jQuery.cookie('wpsg_product_view_side', ser);
-				
-			},
-			receive: function(e, ui) {
-			}
-		}); 
-
-	    if (jQuery.cookie('wpsg_product_view_normal') != null)
-		{
-
-			var divs = jQuery.cookie('wpsg_product_view_normal').split(',').reverse();
-
-			for (index in divs)
-			{
-
-				jQuery('#normal-sortables').prepend(jQuery('#wpsg_' + divs[index]));
-				
-			}
+		<div id="wpsg_relatedproducts_produktauswahl"></div>
 			
-		}
-
-		if (jQuery.cookie('wpsg_product_view_side') != null)
-		{
-
-			var divs = jQuery.cookie('wpsg_product_view_side').split(',').reverse();
-
-			for (index in divs)
-			{
-
-				jQuery('#side-sortables').prepend(jQuery('#wpsg_' + divs[index]));
-				
-			}
-			
-		}
-
-		var click_x = false;
-		var click_y = false;
-		
-		jQuery('.wpsg_handlediv').bind('click', function(ev) {
-
-			if (Math.abs(click_x - ev.pageX) <= 5 && Math.abs(click_y - ev.pageY) <= 5)
-			{
-
-				jQuery(this).next().toggle();
-
-				var arClose = new Array();
-				jQuery('.wpsg_product_view .postbox .inside:hidden').each(function() {
-					arClose.push(jQuery(this).parent().attr("id"));
-				} );
-
-				jQuery.cookie('wpsg_product_closed', arClose.join(','));
-					
-			}
-			
-		} );
-		
-		jQuery('.wpsg_handlediv').bind('mousedown', function(ev) {
-
-			click_x = ev.pageX;
-			click_y = ev.pageY;	
-						
-		} );
-
-		if (jQuery.cookie('wpsg_product_closed') != null && jQuery.cookie('wpsg_product_closed') != '')
-		{
-
-			var arClose = jQuery.cookie('wpsg_product_closed').split(',');
-
-			for (index in arClose)
-			{
-
-				jQuery('#' + arClose[index] + ' .inside').hide();
-							
-			}
-			
-		}
-
-		jQuery('#submit, #submit_index').bind('click', function() {
-
-			if (wpsg_product_edit_change.length > 0)
-			{
-
-				jQuery('.wpsg_change_error').removeClass('wpsg_change_error');
-				
-			    for (var i = 0; i < wpsg_product_edit_change.length; i++) {
-			    	 
-			        jQuery('#' + wpsg_product_edit_change[i]).addClass('wpsg_change_error');
-			        
-			    }
-
-			    alert('<?php echo __('Bitte ÃŒberprÃŒfen Sie die rot markierten Felder. Ãnderungen in diesen Feldern gehen beim Speichern verloren.', 'wpsg'); ?>');
-
-			    return false;
-				
-			}
-			else
-			{
-
-				return true;
-				
-			}
-			
-		} );
-		
-		// Flaggen fÃŒr die aktuelle Sprache davorbauen
-		<?php if ($this->isMultiLingual() && isset($_REQUEST['wpsg_lang'])) { $arLang = $this->getStoreLanguages(); $lang = $arLang[$_REQUEST['wpsg_lang']]; ?>
-		jQuery('.wpsg_handlediv').prepend('<img src="<?php echo $this->getFlagURL().$lang['flag']; ?>" alt="<?php echo $lang['name']; ?>" />&nbsp;');
-		<?php } ?>
-	    
-	} );
-             
-/* ]]> */</script> 
-
-<div class="wrap columns-2 wpsg_produkt_addedit wpsg_product_view" id="wpsg_product_view">
-	
-	<div id="wpsg_relatedproducts_produktauswahl"></div>
-
-	<div class="icon32 icon32-posts-post" id="icon-edit"><br /></div>
-	<h2>
-		<?php if (wpsg_getInt($_REQUEST['edit_id']) > 0) { ?>
-		<?php echo __('Produkt bearbeiten', 'wpsg'); ?>
-		<?php if (isset($_REQUEST['wpsg_lang'])) { ?>
-		&nbsp;[<?php $arLang = $this->getStoreLanguages(); echo $arLang[$_REQUEST['wpsg_lang']]['name']; ?> <img src="<?php echo $this->getFlagURL().$arLang[$_REQUEST['wpsg_lang']]['flag']; ?>" alt="" />]
-		<?php } ?>
-		<?php } else { ?>
-		<?php echo __('Neues Produkt', 'wpsg'); ?>
-		<?php } ?>		
-	</h2>
-	<br />
-	
-	<?php echo $this->writeBackendMessage(); ?>
-	
- 	<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&amp;action=save&amp;noheader=1" enctype="multipart/form-data">
-
-		<div id="postbox" class="metabox-holder has-right-sidebar">
-
-			<div id="side-info-column" class="inner-sidebar" style="width:386px;">
-				<div id="side-sortables" class="meta-box-sortables ui-sortable" style="width:380px;">
-							
-					<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
-					<div id="wpsg_preis" class="postbox">						
-						<h3 class="wpsg_handlediv">
-							<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
-							<span><?php echo __('Preis / Steuer', 'wpsg'); ?></span>
-						</h3>
-						<div class="inside">
-							<?php echo wpsg_drawForm_Select('mwst_key', __('Steuergruppe', 'wpsg'), wpsg_tax_groups(true), @$this->view['data']['mwst_key']); ?>
-							<?php if ($this->get_option('wpsg_preisangaben') == WPSG_NETTO) { ?>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">
-									<label for="preis">
-										<?php echo __('Preis (NETTO)', 'wpsg'); ?>:										
-									</label>
-								</div>
-								<div class="wpsg_form_right">
-									<p class="waehrung"><?php echo $this->get_option('wpsg_currency'); ?></p>									
-									<input id="preis" type="text" value="<?php echo wpsg_hspc(wpsg_ff($this->view['data']['preis'])); ?>" name="preis" class="wpsg_preis" />																		
-								</div>
-								<div class="wpsg_clear"></div>
+	 	<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&amp;action=save&amp;noheader=1" enctype="multipart/form-data">
+	
+			<div id="postbox" class="metabox-holder has-right-sidebar" style="padding-top:0px;">
+	
+				<div id="side-info-column" class="inner-sidebar" style="width:386px;">
+					<div id="side-sortables" class="meta-box-sortables ui-sortable" style="width:380px;">
+								
+						<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
+						<div id="wpsg_preis" class="postbox">						
+							<h3 class="wpsg_handlediv">
+								<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
+								<span><?php echo __('Preis / Steuer', 'wpsg'); ?></span>
+							</h3>
+							<div class="inside">
+								<?php echo wpsg_drawForm_Select('mwst_key', __('Steuergruppe', 'wpsg'), wpsg_tax_groups(true), @$this->view['data']['mwst_key']); ?>								
+								<?php echo wpsg_drawForm_Input('preis', wpsg_translate(__('Preis (#1#)', 'wpsg'), (($this->getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['preis'])); ?>
+								<?php echo wpsg_drawForm_Input('oldprice', wpsg_translate(__('Alter Preis (#1#)', 'wpsg'), (($this->getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['oldprice'])); ?>
+								<?php echo wpsg_drawForm_Input('', __('Steueranteil', 'wpsg'), wpsg_ff(@$this->view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?>
+								<?php echo wpsg_drawForm_Checkbox('euleistungsortregel', __('Produkt unterliegt den EU-Leistungsortregeln', 'wpsg'), @$this->view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?>
+								<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=laender">LÃ€nderverwaltung</a>							
 							</div>
-							<?php } ?>
-							<?php if ($this->get_option('wpsg_preisangaben') == WPSG_BRUTTO) { ?>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">									
-									<?php echo __('Preis (BRUTTO)', 'wpsg'); ?>:
-								</div>
-								<div class="wpsg_form_right">
-									<p class="waehrung"><?php echo $this->get_option('wpsg_currency'); ?></p>
-									<input id="preis" type="text" value="<?php echo wpsg_hspc(wpsg_ff(@$this->view['data']['preis'])); ?>" name="preis" class="wpsg_preis" />
-								</div>
-								<div class="wpsg_clear"></div>
+						</div>
+						<div id="wpsg_paymentmethods" class="postbox">						
+							<h3 class="wpsg_handlediv">
+								<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
+								<span><?php echo __('Erlaubte Zahlungsarten', 'wpsg'); ?></span>
+							</h3>
+							<div class="inside wpsg_form_field_max">	
+								<select id="wpsg_paymentmethods_select" name="wpsg_paymentmethods_select">
+									<option value="0"><?php echo __('Alle', 'wpsg'); ?></option>
+									<option value="1" <?php echo ((wpsg_isSizedArray($this->view['allowedPayment']))?'selected="selected"':''); ?>><?php echo __('Auswahl', 'wpsg'); ?></option>
+								</select>
+								<div class="wpsg_paymentmethods_select">
+									<?php foreach ($this->arPayment as $p) { if (!isset($p['deleted']) || $p['deleted'] != '1') { ?>
+										<?php echo wpsg_drawForm_Checkbox('wpsg_paymentmethods[]', $p['name'], in_array($p['id'], (array)$this->view['allowedPayment']), array('id' => 'wpsg_paymentmethods_'.$p['id'], 'value' => $p['id'])); ?>
+									<?php } } ?>
+								</div>
+								
+								<script type="text/javascript">/* <![CDATA[ */
+	
+									jQuery('#wpsg_paymentmethods_select').bind('change', function() {
+	
+										if (jQuery(this).val() == '1')
+										{
+	
+											jQuery('.wpsg_paymentmethods_select').show();
+											
+										}
+										else
+										{
+	
+											jQuery('.wpsg_paymentmethods_select').hide();
+											
+										}
+										
+									} ).change();
+								
+								/* ]]> */</script>
 							</div>
-							<?php } ?>
-							<?php echo wpsg_drawForm_Input('', __('Steueranteil', 'wpsg'), wpsg_ff(@$this->view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?>
-							<?php echo wpsg_drawForm_Checkbox('euleistungsortregel', __('Produkt unterliegt den EU-Leistungsortregeln', 'wpsg'), @$this->view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?>
-							<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=laender">LÃ€nderverwaltung</a>							
 						</div>
-					</div>
-					<div id="wpsg_paymentmethods" class="postbox">						
-						<h3 class="wpsg_handlediv">
-							<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
-							<span><?php echo __('Erlaubte Zahlungsarten', 'wpsg'); ?></span>
-						</h3>
-						<div class="inside wpsg_form_field_max">	
-							<select id="wpsg_paymentmethods_select" name="wpsg_paymentmethods_select">
-								<option value="0"><?php echo __('Alle', 'wpsg'); ?></option>
-								<option value="1" <?php echo ((wpsg_isSizedArray($this->view['allowedPayment']))?'selected="selected"':''); ?>><?php echo __('Auswahl', 'wpsg'); ?></option>
-							</select>
-							<div class="wpsg_paymentmethods_select">
-								<?php foreach ($this->arPayment as $p) { if (!isset($p['deleted']) || $p['deleted'] != '1') { ?>
-									<?php echo wpsg_drawForm_Checkbox('wpsg_paymentmethods[]', $p['name'], in_array($p['id'], (array)$this->view['allowedPayment']), array('id' => 'wpsg_paymentmethods_'.$p['id'], 'value' => $p['id'])); ?>
-								<?php } } ?>
+						<div id="wpsg_shippingmethods" class="postbox">
+							<h3 class="wpsg_handlediv">
+								<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
+								<span><?php echo __('Erlaubte Versandarten', 'wpsg'); ?></span>
+							</h3>
+							<div class="inside wpsg_form_field_max">
+								<select id="wpsg_shippingmethods_select" name="wpsg_shippingmethods_select">
+									<option value="0"><?php echo __('Alle', 'wpsg'); ?></option>
+									<option value="1" <?php echo ((wpsg_isSizedArray($this->view['allowedShipping']))?'selected="selected"':''); ?>><?php echo __('Auswahl', 'wpsg'); ?></option>								
+								</select>
+								<div class="wpsg_shippingmethods_select">
+									<?php foreach ($this->arShipping as $s) { if (!isset($s['deleted']) || $s['deleted'] != '1') { ?>
+										<?php echo wpsg_drawForm_Checkbox('wpsg_shippingmethods[]', $s['name'], in_array($s['id'], (array)$this->view['allowedShipping']), array('id' => 'wpsg_paymentmethods_'.$s['id'], 'value' => $s['id'])); ?>
+									<?php } } ?>
+								</div>
 							</div>
 							
 							<script type="text/javascript">/* <![CDATA[ */
-
-								jQuery('#wpsg_paymentmethods_select').bind('change', function() {
-
+	
+								jQuery('#wpsg_shippingmethods_select').bind('change', function() {
+	
 									if (jQuery(this).val() == '1')
 									{
-
-										jQuery('.wpsg_paymentmethods_select').show();
+	
+										jQuery('.wpsg_shippingmethods_select').show();
 										
 									}
 									else
 									{
-
-										jQuery('.wpsg_paymentmethods_select').hide();
+	
+										jQuery('.wpsg_shippingmethods_select').hide();
 										
 									}
@@ -250,275 +269,237 @@
 							/* ]]> */</script>
 						</div>
+						<?php } ?>
+											
+						<?php $this->callMods('produkt_edit_sidebar', array(&$this->view['data'])); ?>
+						 
 					</div>
-					<div id="wpsg_shippingmethods" class="postbox">
-						<h3 class="wpsg_handlediv">
-							<div class="handlediv" title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>"><br /></div>
-							<span><?php echo __('Erlaubte Versandarten', 'wpsg'); ?></span>
-						</h3>
-						<div class="inside wpsg_form_field_max">
-							<select id="wpsg_shippingmethods_select" name="wpsg_shippingmethods_select">
-								<option value="0"><?php echo __('Alle', 'wpsg'); ?></option>
-								<option value="1" <?php echo ((wpsg_isSizedArray($this->view['allowedShipping']))?'selected="selected"':''); ?>><?php echo __('Auswahl', 'wpsg'); ?></option>								
-							</select>
-							<div class="wpsg_shippingmethods_select">
-								<?php foreach ($this->arShipping as $s) { if (!isset($s['deleted']) || $s['deleted'] != '1') { ?>
-									<?php echo wpsg_drawForm_Checkbox('wpsg_shippingmethods[]', $s['name'], in_array($s['id'], (array)$this->view['allowedShipping']), array('id' => 'wpsg_paymentmethods_'.$s['id'], 'value' => $s['id'])); ?>
-								<?php } } ?>
+				</div>
+			
+				<div id="post-body">
+					
+					<div id="titlediv" style="margin-right:400px;">
+						<div id="titlewrap">					
+							<input type="text" placeholder="<?php echo __('Produktname', 'wpsg'); ?>" id="title" value="<?php echo wpsg_hspc(@$this->view['data']['name']); ?>" tabindex="1" size="30" name="name">
+						</div>
+					</div>
+					
+					<br />
+									
+					<div id="normal-sortables" class="meta-box-sortables" style="margin-right:400px;">
+							
+						<div id="wpsg_generally" class="postbox">		
+							<h3 class="wpsg_handlediv">
+								<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
+								<span><?php echo __('Allgemein', 'wpsg'); ?></span>
+							</h3>
+							<div class="inside">
+								<?php if ($this->isMultiLingual()) { ?>
+								<div class="wpsg_form_field">
+									<div class="wpsg_form_left">
+										<label for="produkt_anr"><?php echo __("Ãbersetzungen", "wpsg"); ?>:</label>
+									</div>								
+									<div class="wpsg_form_right wpsg_form_language">																											
+										<?php foreach ($this->getStoreLanguages() as $a) { ?>
+											<?php if ((isset($_REQUEST['wpsg_lang']) && $_REQUEST['wpsg_lang'] != $a['locale']) || (!isset($_REQUEST['wpsg_lang']) && $a['lang'] != $GLOBALS['q_config']['default_language'])) { ?>
+											<?php if (isset($_REQUEST['wpsg_lang']) && $a['lang'] == $GLOBALS['q_config']['default_language']) { ?>
+											<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
+											<?php } else { ?>
+											<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>&wpsg_lang=<?php echo $a['locale']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
+											<?php } ?>
+												<img src="<?php echo $this->getFlagURL().$a['flag']; ?>" alt="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>" />
+											</a>
+											<?php } ?>
+										<?php } ?>
+									</div>
+									<div class="wpsg_clear"></div>
+								</div>
+								<?php } ?>
+								<div class="wpsg_form_field">
+									<div class="wpsg_form_left">
+										<label for="produkt_anr"><?php echo __("Produktname (Detail)", "wpsg"); ?>:</label>
+									</div>
+									<div class="wpsg_form_right">
+										<input id="detailname" type="text" value="<?php echo wpsg_hspc(@$this->view['data']['detailname']); ?>" name="detailname" />
+									</div>
+									<div class="wpsg_clear"></div>
+								</div>
+								<?php if (wpsg_isSizedInt($this->view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?>
+								<div class="wpsg_form_field">
+									<div class="wpsg_form_left">
+										<label for="produkt_id"><?php echo __('Produkt ID', 'wpsg'); ?>:</label>
+									</div>
+									<div class="wpsg_form_right">
+										<input type="text" name="produkt_id" value="<?php echo wpsg_hspc(@$this->view['data']['id']); ?>" readonly="readonly" />
+									</div>
+									<div class="wpsg_clear"></div>
+								</div>
+								<?php } ?>
+								<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
+								<div class="wpsg_form_field">
+									<div class="wpsg_form_left">
+										<label for="produkt_anr"><?php echo __("Artikelnummer", "wpsg"); ?>:</label>
+									</div>
+									<div class="wpsg_form_right">
+										<input id="produkt_anr" type="text" value="<?php echo wpsg_hspc(@$this->view['data']['anr']); ?>" name="anr" />
+									</div>
+									<div class="wpsg_clear"></div>
+								</div>
+								<div class="wpsg_form_field">
+									<div class="wpsg_form_left">
+										<label for="produkt_ptemplate"><?php echo __('Produkttemplate', 'wpsg'); ?>:</label>									
+									</div>
+									<div class="wpsg_form_right">
+										<?php if (!is_array($this->view['templates']) || sizeof($this->view['templates']) <= 0) { ?>
+										<p class="wpsg_error"><?php echo __('Keine Templatedatein gefunden!', 'wpsg'); ?></p>
+										<?php } else { ?>
+										<select name="ptemplate_file" id="produkt_ptemplate">
+											<?php foreach ($this->view['templates'] as $t) { ?>
+											<option <?php echo (($t == @$this->view['data']['ptemplate_file'] || (!isset($this->view['data']['ptemplate_file']) && $t == 'standard.phtml'))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($t); ?>"><?php echo wpsg_hspc($t); ?></option>
+											<?php } ?>
+										</select>
+										<?php } ?>
+									</div>
+									<div class="wpsg_clear"></div>
+								</div>
+								<div class="wpsg_form_field">
+									<div class="wpsg_form_left">
+										<label for="produkt_ptemplate"><?php echo __('URL Benachrichtigung', 'wpsg'); ?>:</label>									
+									</div>
+									<div class="wpsg_form_right">
+										<input style="width:95%;" type="text" name="posturl" class="wpsg_posturl" value="<?php echo wpsg_hspc(@$this->view['data']['posturl']); ?>" />
+										<div class="wpsg_clear" style="height:7px;"></div>
+										<label><input type="checkbox" <?php echo ((@$this->view['data']['posturl_verkauf'] == '1')?'checked="checked"':''); ?> value="1" name="posturl_verkauf" style="width:auto; float:none;" />&nbsp;<?php echo __('beim Verkauf', 'wpsg'); ?></label>
+										&nbsp;&nbsp;
+										<label><input type="checkbox" <?php echo ((@$this->view['data']['posturl_bezahlung'] == '1')?'checked="checked"':''); ?> value="1" name="posturl_bezahlung" style="width:auto; float:none;" />&nbsp;<?php echo __('bei Bezahlung', 'wpsg'); ?></label>
+										<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=URLBenachrichtigung" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=URLBenachrichtigung" class="wpsg_form_help"></a>									 						 
+									</div>
+									<div class="wpsg_clear"></div>
+								</div>	
+								<?php } ?>
+								
+								<?php if (!$this->hasMod('wpsg_mod_produktartikel') && !isset($_REQUEST['wpsg_lang'])) { ?>
+								<div class="wpsg_form_field">
+									<div class="wpsg_form_left">
+										<label for="partikel"><?php echo __('Zugeordneter Wordpress Artikel', 'wpsg'); ?>:</label>
+									</div>								
+									<div class="wpsg_form_right">
+										<select id="partikel" name="partikel">
+											<option value=""><?php echo __("Bitte auswÃ€hlen", "wpsg"); ?></option>									
+											<?php $arArtikel = get_posts('numberposts=-1'); if (is_array($arArtikel) && sizeof($arArtikel) > 0) { ?>
+											<optgroup label="<?php echo __('Artikel', 'wpsg'); ?>">
+												<?php foreach ($arArtikel as $a) { ?>
+												<option <?php echo (($a->ID == $this->view['data']['partikel'])?'selected="selected"':''); ?> value="<?php echo $a->ID; ?>"><?php echo $a->post_title; ?></option>
+												<?php } ?>
+											</optgroup>
+											<?php } ?>
+											<?php $arPages = get_pages(); if (is_array($arPages) && sizeof($arPages) > 0) { ?>
+											<optgroup label="<?php echo __('Seiten', 'wpsg'); ?>">
+												<?php foreach ($arPages as $p) { ?>
+												<option <?php echo (($p->ID == $this->view['data']['partikel'])?'selected="selected"':''); ?> value="<?php echo $p->ID; ?>"><?php echo $p->post_title; ?></option>
+												<?php } ?>
+											</optgroup>
+											<?php } ?>
+										</select>
+									</div>
+									<div class="wpsg_clear"></div>
+								</div>
+								<?php } ?>
+								
+								<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
+								<?php echo wpsg_drawForm_Select('basket_multiple', __('Verhalten im Warenkorb', 'wpsg'), array(
+									'0' => __('Nur einmal mit beliebiger Menge (Standard)', 'wpsg'),
+									'4' => __('Nur einmal mit Menge 1', 'wpsg'),
+									'1' => __('Mehrfach mit beliebiger Menge', 'wpsg'),
+									'2' => __('Mehrfach mit Menge 1', 'wpsg')
+								), @$this->view['data']['basket_multiple'], array('help' => 'basket_multiple')); ?>							
+								<?php } ?>
+								 
+								<?php if ($this->view['data']['id'] > 0) { ?>
+								<div class="wpsg_form_field">
+									<div class="wpsg_form_left">
+										<label for="produkt_ptemplate"><?php echo __('URL', 'wpsg'); ?>:</label>									
+									</div>
+									<div class="wpsg_form_right">	
+										<p>									
+											<a href="<?php echo $this->getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['lang_parent']))?$this->view['data']['lang_parent']:$this->view['data']['id']))); ?>"><?php echo $this->getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['lang_parent']))?$this->view['data']['lang_parent']:$this->view['data']['id']))); ?></a>
+										</p>
+									</div>
+									<div class="wpsg_clear"></div>
+								</div>	
+								<?php } ?>
+								
+								<?php $this->callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?>
+								
 							</div>
 						</div>
-						
-						<script type="text/javascript">/* <![CDATA[ */
-
-							jQuery('#wpsg_shippingmethods_select').bind('change', function() {
-
-								if (jQuery(this).val() == '1')
+					
+						<div id="wpsg_description" class="postbox">		
+							<h3 class="wpsg_handlediv">
+								<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
+								<span><?php echo __('Beschreibung', 'wpsg'); ?></span>
+							</h3>	
+							<div class="inside">
+							 
+								<?php 
+								
+								function wpsg_ShowTinyMCE() { 
+									
+									 
+									
+									wp_print_scripts('editor');
+									if (function_exists('add_thickbox')) add_thickbox();
+									wp_print_scripts('media-upload');
+									if (function_exists('wp_tiny_mce')) wp_tiny_mce();
+									wp_admin_css();
+									
+									do_action("admin_print_styles-post-php");
+									do_action('admin_print_styles');
+									
+								}
+								
+								function wpsg_formatTinyMCE($in)
 								{
-
-									jQuery('.wpsg_shippingmethods_select').show();
+									
+									if (isset($in['theme_advanced_buttons1'])) $in['theme_advanced_buttons1'] = str_replace(",wpsg", "", $in['theme_advanced_buttons1']);
+									
+									return $in;
 									
 								}
-								else
-								{
-
-									jQuery('.wpsg_shippingmethods_select').hide();
-									
-								}
-								
-							} ).change();
-						
-						/* ]]> */</script>
+								
+								// Damit die qTranslate Interne Editor Ãbersetzung nicht aufgerufen wird
+								remove_filter('the_editor', 'qtrans_modifyRichEditor');
+								
+								add_filter('tiny_mce_before_init', 'wpsg_formatTinyMCE');
+								add_filter('admin_head','wpsg_ShowTinyMCE');
+								wp_editor(@$this->view['data']['beschreibung'], 'beschreibung');
+								
+								?>
+											
+							</div>
+						</div>
+				
+						<?php $this->callMods('produkt_edit_content', array(&$this->view['data'])); ?>
+					
 					</div>
+							
+					<?php if ($_REQUEST['edit_id'] > 0) { ?>
+					<input type="hidden" name="edit_id" value="<?php echo $_REQUEST['edit_id']; ?>" />
 					<?php } ?>
-										
-					<?php $this->callMods('produkt_edit_sidebar', array(&$this->view['data'])); ?>
-					 
+					
+					<?php if (isset($_REQUEST['wpsg_lang'])) { ?>
+					<input type="hidden" name="wpsg_lang" value="<?php echo $_REQUEST['wpsg_lang']; ?>" />
+					<?php } ?>
+				
+					<p class="submit">
+						<input type="submit" value="<?php echo __('Produkt speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" />
+						<input type="submit" value="<?php echo __('Produkt speichern und zur Ãbersicht', 'wpsg'); ?>" class="button-primary" id="submit_index" name="submit_index" />
+					</p>
+					
 				</div>
+		
 			</div>
 		
-			<div id="post-body">
-				
-				<div id="titlediv" style="margin-right:400px;">
-					<div id="titlewrap">					
-						<input type="text" placeholder="<?php echo __('Produktname', 'wpsg'); ?>" id="title" value="<?php echo wpsg_hspc(@$this->view['data']['name']); ?>" tabindex="1" size="30" name="name">
-					</div>
-				</div>
-				
-				<br />
-								
-				<div id="normal-sortables" class="meta-box-sortables" style="margin-right:400px;">
-						
-					<div id="wpsg_generally" class="postbox">		
-						<h3 class="wpsg_handlediv">
-							<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-							<span><?php echo __('Allgemein', 'wpsg'); ?></span>
-						</h3>
-						<div class="inside">
-							<?php if ($this->isMultiLingual()) { ?>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">
-									<label for="produkt_anr"><?php echo __("Ãbersetzungen", "wpsg"); ?>:</label>
-								</div>								
-								<div class="wpsg_form_right wpsg_form_language">																											
-									<?php foreach ($this->getStoreLanguages() as $a) { ?>
-										<?php if ((isset($_REQUEST['wpsg_lang']) && $_REQUEST['wpsg_lang'] != $a['locale']) || (!isset($_REQUEST['wpsg_lang']) && $a['lang'] != $GLOBALS['q_config']['default_language'])) { ?>
-										<?php if (isset($_REQUEST['wpsg_lang']) && $a['lang'] == $GLOBALS['q_config']['default_language']) { ?>
-										<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
-										<?php } else { ?>
-										<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>&wpsg_lang=<?php echo $a['locale']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
-										<?php } ?>
-											<img src="<?php echo $this->getFlagURL().$a['flag']; ?>" alt="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>" />
-										</a>
-										<?php } ?>
-									<?php } ?>
-								</div>
-								<div class="wpsg_clear"></div>
-							</div>
-							<?php } ?>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">
-									<label for="produkt_anr"><?php echo __("Produktname (Detail)", "wpsg"); ?>:</label>
-								</div>
-								<div class="wpsg_form_right">
-									<input id="detailname" type="text" value="<?php echo wpsg_hspc(@$this->view['data']['detailname']); ?>" name="detailname" />
-								</div>
-								<div class="wpsg_clear"></div>
-							</div>
-							<?php if (wpsg_isSizedInt($this->view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">
-									<label for="produkt_id"><?php echo __('Produkt ID', 'wpsg'); ?>:</label>
-								</div>
-								<div class="wpsg_form_right">
-									<input type="text" name="produkt_id" value="<?php echo wpsg_hspc(@$this->view['data']['id']); ?>" readonly="readonly" />
-								</div>
-								<div class="wpsg_clear"></div>
-							</div>
-							<?php } ?>
-							<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">
-									<label for="produkt_anr"><?php echo __("Artikelnummer", "wpsg"); ?>:</label>
-								</div>
-								<div class="wpsg_form_right">
-									<input id="produkt_anr" type="text" value="<?php echo wpsg_hspc(@$this->view['data']['anr']); ?>" name="anr" />
-								</div>
-								<div class="wpsg_clear"></div>
-							</div>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">
-									<label for="produkt_ptemplate"><?php echo __('Produkttemplate', 'wpsg'); ?>:</label>									
-								</div>
-								<div class="wpsg_form_right">
-									<?php if (!is_array($this->view['templates']) || sizeof($this->view['templates']) <= 0) { ?>
-									<p class="wpsg_error"><?php echo __('Keine Templatedatein gefunden!', 'wpsg'); ?></p>
-									<?php } else { ?>
-									<select name="ptemplate_file" id="produkt_ptemplate">
-										<?php foreach ($this->view['templates'] as $t) { ?>
-										<option <?php echo (($t == @$this->view['data']['ptemplate_file'] || (!isset($this->view['data']['ptemplate_file']) && $t == 'standard.phtml'))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($t); ?>"><?php echo wpsg_hspc($t); ?></option>
-										<?php } ?>
-									</select>
-									<?php } ?>
-								</div>
-								<div class="wpsg_clear"></div>
-							</div>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">
-									<label for="produkt_ptemplate"><?php echo __('URL Benachrichtigung', 'wpsg'); ?>:</label>									
-								</div>
-								<div class="wpsg_form_right">
-									<input style="width:95%;" type="text" name="posturl" class="wpsg_posturl" value="<?php echo wpsg_hspc(@$this->view['data']['posturl']); ?>" />
-									<div class="wpsg_clear"></div>
-									<label><input type="checkbox" <?php echo ((@$this->view['data']['posturl_verkauf'] == '1')?'checked="checked"':''); ?> value="1" name="posturl_verkauf" style="width:auto; float:none;" />&nbsp;<?php echo __('beim Verkauf', 'wpsg'); ?></label>
-									&nbsp;&nbsp;
-									<label><input type="checkbox" <?php echo ((@$this->view['data']['posturl_bezahlung'] == '1')?'checked="checked"':''); ?> value="1" name="posturl_bezahlung" style="width:auto; float:none;" />&nbsp;<?php echo __('bei Bezahlung', 'wpsg'); ?></label>
-									<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=URLBenachrichtigung" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=URLBenachrichtigung" class="wpsg_form_help"></a>									 						 
-								</div>
-								<div class="wpsg_clear"></div>
-							</div>	
-							<?php } ?>
-							
-							<?php if (!$this->hasMod('wpsg_mod_produktartikel') && !isset($_REQUEST['wpsg_lang'])) { ?>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">
-									<label for="partikel"><?php echo __('Zugeordneter Wordpress Artikel', 'wpsg'); ?>:</label>
-								</div>								
-								<div class="wpsg_form_right">
-									<select id="partikel" name="partikel">
-										<option value=""><?php echo __("Bitte auswÃ€hlen", "wpsg"); ?></option>									
-										<?php $arArtikel = get_posts('numberposts=-1'); if (is_array($arArtikel) && sizeof($arArtikel) > 0) { ?>
-										<optgroup label="<?php echo __('Artikel', 'wpsg'); ?>">
-											<?php foreach ($arArtikel as $a) { ?>
-											<option <?php echo (($a->ID == $this->view['data']['partikel'])?'selected="selected"':''); ?> value="<?php echo $a->ID; ?>"><?php echo $a->post_title; ?></option>
-											<?php } ?>
-										</optgroup>
-										<?php } ?>
-										<?php $arPages = get_pages(); if (is_array($arPages) && sizeof($arPages) > 0) { ?>
-										<optgroup label="<?php echo __('Seiten', 'wpsg'); ?>">
-											<?php foreach ($arPages as $p) { ?>
-											<option <?php echo (($p->ID == $this->view['data']['partikel'])?'selected="selected"':''); ?> value="<?php echo $p->ID; ?>"><?php echo $p->post_title; ?></option>
-											<?php } ?>
-										</optgroup>
-										<?php } ?>
-									</select>
-								</div>
-								<div class="wpsg_clear"></div>
-							</div>
-							<?php } ?>
-							
-							<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
-							<?php echo wpsg_drawForm_Select('basket_multiple', __('Verhalten im Warenkorb', 'wpsg'), array(
-								'0' => __('Nur einmal mit beliebiger Menge (Standard)', 'wpsg'),
-								'4' => __('Nur einmal mit Menge 1', 'wpsg'),
-								'1' => __('Mehrfach mit beliebiger Menge', 'wpsg'),
-								'2' => __('Mehrfach mit Menge 1', 'wpsg')
-							), @$this->view['data']['basket_multiple'], array('help' => 'basket_multiple')); ?>							
-							<?php } ?>
-							 
-							<?php if ($this->view['data']['id'] > 0) { ?>
-							<div class="wpsg_form_field">
-								<div class="wpsg_form_left">
-									<label for="produkt_ptemplate"><?php echo __('URL', 'wpsg'); ?>:</label>									
-								</div>
-								<div class="wpsg_form_right">	
-									<p>									
-										<a href="<?php echo $this->getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['lang_parent']))?$this->view['data']['lang_parent']:$this->view['data']['id']))); ?>"><?php echo $this->getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['lang_parent']))?$this->view['data']['lang_parent']:$this->view['data']['id']))); ?></a>
-									</p>
-								</div>
-								<div class="wpsg_clear"></div>
-							</div>	
-							<?php } ?>
-							
-							<?php $this->callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?>
-							
-						</div>
-					</div>
-				
-					<div id="wpsg_description" class="postbox">		
-						<h3 class="wpsg_handlediv">
-							<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
-							<span><?php echo __('Beschreibung', 'wpsg'); ?></span>
-						</h3>	
-						<div class="inside">
-						 
-							<?php 
-							
-							function wpsg_ShowTinyMCE() { 
-								
-								 
-								
-								wp_print_scripts('editor');
-								if (function_exists('add_thickbox')) add_thickbox();
-								wp_print_scripts('media-upload');
-								if (function_exists('wp_tiny_mce')) wp_tiny_mce();
-								wp_admin_css();
-								
-								do_action("admin_print_styles-post-php");
-								do_action('admin_print_styles');
-								
-							}
-							
-							function wpsg_formatTinyMCE($in)
-							{
-								
-								if (isset($in['theme_advanced_buttons1'])) $in['theme_advanced_buttons1'] = str_replace(",wpsg", "", $in['theme_advanced_buttons1']);
-								
-								return $in;
-								
-							}
-							
-							// Damit die qTranslate Interne Editor Ãbersetzung nicht aufgerufen wird
-							remove_filter('the_editor', 'qtrans_modifyRichEditor');
-							
-							add_filter('tiny_mce_before_init', 'wpsg_formatTinyMCE');
-							add_filter('admin_head','wpsg_ShowTinyMCE');
-							wp_editor(@$this->view['data']['beschreibung'], 'beschreibung');
-							
-							?>
-										
-						</div>
-					</div>
-			
-					<?php $this->callMods('produkt_edit_content', array(&$this->view['data'])); ?>
-				
-				</div>
-						
-				<?php if ($_REQUEST['edit_id'] > 0) { ?>
-				<input type="hidden" name="edit_id" value="<?php echo $_REQUEST['edit_id']; ?>" />
-				<?php } ?>
-				
-				<?php if (isset($_REQUEST['wpsg_lang'])) { ?>
-				<input type="hidden" name="wpsg_lang" value="<?php echo $_REQUEST['wpsg_lang']; ?>" />
-				<?php } ?>
-			
-				<p class="submit">
-					<input type="submit" value="<?php echo __('Produkt speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" />
-					<input type="submit" value="<?php echo __('Produkt speichern und zur Ãbersicht', 'wpsg'); ?>" class="button-primary" id="submit_index" name="submit_index" />
-				</p>
-				
-			</div>
-	
-		</div>
-	
-	</form>
-	
-</div> 
+		</form>
+		
+	</div> 
+</div>
