From 703a450908599b3ebc8018f41f54e510bb0dc255 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 4 Mar 2016 21:04:26 +0000
Subject: - Übernahme neuer Funktionen aus dem alten Zweig / Pfad /
 Einstellungen / Hilfe Icons / Berechnung - Neuer Modulfilter im neuen Backend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5382 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/customerpreset.phtml                   |   8 +-
 views/admin/extended.phtml                         |  21 +-
 views/admin/form/checkbox.phtml                    |   2 +-
 views/admin/form/input.phtml                       |   4 +-
 views/admin/form/select.phtml                      |   4 +-
 views/admin/form/text.phtml                        |   4 +-
 views/admin/includes.phtml                         |   6 +-
 views/admin/index.phtml                            |   6 +-
 views/admin/konfiguration.phtml                    |  16 +-
 views/admin/module.phtml                           |  87 ++-
 views/css/admin.css                                | 720 +--------------------
 views/mods/mod_deliverynote/deliverynote_pdf.phtml |  14 +-
 views/mods/mod_downloadplus/settings_edit.phtml    |   2 +-
 views/mods/mod_fuellmenge/settings_edit.phtml      |   1 +
 views/mods/mod_gutschein/index.phtml               |   2 +-
 views/mods/mod_kundenverwaltung/edit.phtml         |  80 ++-
 views/mods/mod_kundenverwaltung/profil.phtml       | 146 ++++-
 views/mods/mod_kundenverwaltung/register.phtml     |  97 ++-
 .../mods/mod_kundenverwaltung/settings_edit.phtml  |   8 +-
 views/mods/mod_legaltexts/settings_edit.phtml      |   2 +-
 views/mods/mod_micropayment/settings_edit.phtml    |  96 +--
 views/mods/mod_newsletter/settings_edit.phtml      |   5 +-
 views/mods/mod_onepagecheckout/onepage.phtml       |   6 +-
 .../mod_orderupload/checkout_inner_prebutton.phtml |   6 +-
 views/mods/mod_ordervars/ov_list.phtml             |  37 +-
 views/mods/mod_paypal/settings_edit.phtml          |   4 +-
 .../mod_paypalapi/checkout_handlePayment.phtml     |  21 +-
 views/mods/mod_paypalapi/paypalplus.phtml          |  17 +-
 views/mods/mod_paypalapi/settings_edit.phtml       |  14 +-
 views/mods/mod_productvars/pv_list.phtml           |   2 +-
 views/mods/mod_productvars/settings_edit.phtml     |   8 +
 views/mods/mod_produktartikel/produkt.phtml        |   8 +-
 views/mods/mod_produktattribute/list.phtml         |  39 +-
 views/mods/mod_rechnungen/rechnung_pdf.phtml       |  57 +-
 views/mods/mod_relatedproducts/settings_edit.phtml |  15 +-
 views/mods/mod_request/requestpage.phtml           |  24 +-
 views/mods/mod_skrill/order_done.phtml             |   2 +-
 views/mods/mod_su/order_done.phtml                 |   2 +-
 views/mods/mod_su/settings_edit.phtml              |  28 +-
 views/mods/mod_test/settings_edit.phtml            |   4 +-
 views/mods/mod_voucherproduct/voucher_pdf.phtml    |   5 +-
 views/mods/mod_weight/settings_edit.phtml          |   1 +
 views/mods/mod_willcollect/settings_edit.phtml     |   1 +
 views/mods/mod_wirecard/settings_edit.phtml        |  22 +-
 views/order/index.phtml                            |   4 +-
 views/order/view.phtml                             |   2 +-
 views/produkttemplates/standard.phtml              |  18 +-
 views/warenkorb/ajaxDialog.phtml                   | 126 +++-
 views/warenkorb/done.phtml                         |   2 +-
 views/warenkorb/index.phtml                        |   3 +
 views/warenkorb/messageDialog.phtml                |  33 +
 views/warenkorb/progress.phtml                     |  83 ++-
 52 files changed, 906 insertions(+), 1019 deletions(-)
 create mode 100644 views/warenkorb/messageDialog.phtml

diff --git a/views/admin/customerpreset.phtml b/views/admin/customerpreset.phtml
index 4f8fab1..128c2ac 100644
--- a/views/admin/customerpreset.phtml
+++ b/views/admin/customerpreset.phtml
@@ -24,12 +24,12 @@
 	
 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;noheader=1&amp;subaction=<?php echo $_REQUEST['subaction']; ?>">
 
-		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_shipping', __('Standard Versandart', 'wpsg'), $this->view['arShipping'], $this->get_option('wpsg_customerpreset_shipping')); ?>
-		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_payment', __('Standard Zahlungsart', 'wpsg'), $this->view['arPayment'], $this->get_option('wpsg_customerpreset_payment')); ?>
-		<?php echo wpsg_drawForm_Select('wpsg_defaultland', __('Standardland', 'wpsg'), $this->view['arLander'], $this->get_option('wpsg_defaultland'), array('hint' => 
+		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_shipping', __('Standard Versandart', 'wpsg'), $this->view['arShipping'], $this->get_option('wpsg_customerpreset_shipping'), array('help' => 'wpsg_customerpreset_shipping')); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_payment', __('Standard Zahlungsart', 'wpsg'), $this->view['arPayment'], $this->get_option('wpsg_customerpreset_payment'), array('help' => 'wpsg_customerpreset_payment')); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_defaultland', __('Standardland', 'wpsg'), $this->view['arLander'], $this->get_option('wpsg_defaultland'), array('help' => 'wpsg_defaultland', 'hint' => 
 			'nohspc_'.wpsg_translate(__('Die Länder können in der <a href="#1#">Länderverwaltung</a> definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender')		
 		)); ?>
-		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_title', __('Standardanrede', 'wpsg'), $this->view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array(
+		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_title', __('Standardanrede', 'wpsg'), $this->view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array( 'help' => 'wpsg_customerpreset_title',
 			'hint' => 'nohspc_'.wpsg_translate(__('Die Auswahl kann in den <a href="#1#">Kundendaten</a> definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten'),
 			'noIndex' => true 
 		)); ?>
diff --git a/views/admin/extended.phtml b/views/admin/extended.phtml
index 235143a..d97320b 100644
--- a/views/admin/extended.phtml
+++ b/views/admin/extended.phtml
@@ -24,25 +24,26 @@
 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=extended&noheader=1'); ?>">
 	
 		<?php echo wpsg_drawForm_Input('wpsg_salt', __('SALT Schlüssel', 'wpsg'), $this->get_option('wpsg_salt')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_options_nl2br', __('RTE Felder mit nl2br speichern', 'wpsg'), $this->get_option('wpsg_options_nl2br')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_debugModus', __('Debug Modus', 'wpsg'), $this->get_option('wpsg_debugModus')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_options_nl2br', __('RTE Felder mit nl2br speichern', 'wpsg'), $this->get_option('wpsg_options_nl2br'), array('help' => 'wpsg_options_nl2br')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_debugModus', __('Debug Modus', 'wpsg'), $this->get_option('wpsg_debugModus'), array('help' => 'wpsg_debugModus')); ?>
 		
 		<?php if ($this->hasMod('wpsg_mod_core')) { ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_debugURL', __('Beta Updates laden', 'wpsg'), $this->get_option('wpsg_debugURL')); ?>				
+		<?php echo wpsg_drawForm_Checkbox('wpsg_debugURL', __('Beta Updates laden', 'wpsg'), $this->get_option('wpsg_debugURL'), array('help' => 'wpsg_debugURL')); ?>				
 		<?php } ?>
 		
-		<?php echo wpsg_drawForm_Checkbox('wpsg_referer_requesturi', __('RequestURI als ProduktURL verwenden', 'wpsg'), $this->get_option('wpsg_referer_requesturi')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_ignoreuserview', __('User Views ignorieren', 'wpsg'), $this->get_option('wpsg_ignoreuserview')); ?>		
+		<?php echo wpsg_drawForm_Checkbox('wpsg_referer_requesturi', __('RequestURI als ProduktURL verwenden', 'wpsg'), $this->get_option('wpsg_referer_requesturi'), array('help' => 'wpsg_referer_requesturi')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_ignoreuserview', __('User Views ignorieren', 'wpsg'), $this->get_option('wpsg_ignoreuserview'), array('help' => 'wpsg_ignoreuserview')); ?>		
 		<?php echo wpsg_drawForm_Checkbox('wpsg_classicupload', __('Klassisches Upload Formular', 'wpsg'), $this->get_option('wpsg_classicupload')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_content_filter_direct', __('Ausgaben im Warenkorb direkt ausgeben', 'wpsg'), $this->get_option('wpsg_content_filter_direct')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_options_no_rte_apply_filter', __('ApplyFilter Funktion nicht anwenden', 'wpsg'), $this->get_option('wpsg_options_no_rte_apply_filter')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_options_nl2br_out', __('RTE Felder mit nl2br ausgeben', 'wpsg'), $this->get_option('wpsg_options_nl2br_out')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_impexp_clearlinebreak', __('Zeilenumbrüche im Export entfernen', 'wpsg'), $this->get_option('wpsg_impexp_clearlinebreak')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_options_nl2br_out', __('RTE Felder mit nl2br ausgeben', 'wpsg'), $this->get_option('wpsg_options_nl2br_out'), array('help' => 'wpsg_options_n12br_out')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_impexp_clearlinebreak', __('Zeilenumbrüche im Export entfernen', 'wpsg'), $this->get_option('wpsg_impexp_clearlinebreak'), array('help' => 'wpsg_impexp_clearlinebreak')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_removeWpAutoOp', __('wpautop deaktivieren', 'wpsg'), $this->get_option('wpsg_removeWpAutoOp'), array('help' => 'wpsg_removeWpAutoOp')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_removeWpTrimExcerpt', __('wp_trim_excerpt nicht verwenden', 'wpsg'), $this->get_option('wpsg_removeWpTrimExcerpt'), array('help' => 'wpsg_removeWpTrimExcerpt')); ?>		
+		<?php echo wpsg_drawForm_Checkbox('wpsg_removeWpTrimExcerpt', __('wp_trim_excerpt nicht verwenden', 'wpsg'), $this->get_option('wpsg_removeWpTrimExcerpt'), array('help' => 'wpsg_removeWpTrimExcerpt')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_lockOrderTables', __('Bestellungen nicht mit LOCK TABLES verarbeiten', 'wpsg'), $this->get_option('wpsg_lockOrderTables'), array('help' => 'wpsg_lockOrderTables')); ?>		
 		<?php echo wpsg_drawForm_Checkbox('wpsg_autoraw', __('[raw] und [/raw] um Templates ausgeben (Frontend)', 'wpsg'), $this->get_option('wpsg_autoraw')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_nocache', __('Cachen von dynamischen Shopseiten verhindern', 'wpsg'), $this->get_option('wpsg_nocache')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_autolineending', __('MAC Kompatibilität bei Dateiimporten', 'wpsg'), $this->get_option('wpsg_autolineending')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_nocache', __('Cachen von dynamischen Shopseiten verhindern', 'wpsg'), $this->get_option('wpsg_nocache'), array('help' => 'wpsg_nocache')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_autolineending', __('MAC Kompatibilität bei Dateiimporten', 'wpsg'), $this->get_option('wpsg_autolineending'), array('help' => 'wpsg_autolineending')); ?>
 		<?php echo wpsg_drawForm_Select('wpsg_geo_determination', __('Abfrage des Kundenstandortes (EU-Leistungsortregel)', 'wpsg'), $this->view['arGeoMode'], $this->get_option('wpsg_geo_determination'), array('help' => 'wpsg_geo_determination')); ?>
 								
 		<script type="text/javascript">
diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml
index 9c08291..8edf92b 100644
--- a/views/admin/form/checkbox.phtml
+++ b/views/admin/form/checkbox.phtml
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group form-group-sm form-checkbox">
 
 	<div class="col-sm-offset-6 col-sm-6">
 		
diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index c1213d2..e412bcd 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -1,9 +1,9 @@
-<div class="form-group">
+<div class="form-group form-group-sm">
 
 	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>
 	
 	<div class="col-sm-6">
-		<input type="text" class="form-control" name="<?php echo $this->view['field_name']; ?>" value="<?php echo wpsg_hspc($this->view['field_value']); ?>" id="<?php echo $this->view['field_id']; ?>" />
+		<input type="text" class="form-control input-sm" name="<?php echo $this->view['field_name']; ?>" value="<?php echo wpsg_hspc($this->view['field_value']); ?>" id="<?php echo $this->view['field_id']; ?>" />		
 	</div>
 	
 </div>
\ No newline at end of file
diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml
index 70e040c..d0f0ee7 100644
--- a/views/admin/form/select.phtml
+++ b/views/admin/form/select.phtml
@@ -1,10 +1,10 @@
-<div class="form-group">
+<div class="form-group form-group-sm">
 
 	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>
 	
 	<div class="col-sm-6">
 		
-		<select id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>">
+		<select id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>" class="form-control input-sm">
 			<?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>
 			<?php } ?>
diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml
index 49554c5..8325653 100644
--- a/views/admin/form/text.phtml
+++ b/views/admin/form/text.phtml
@@ -1,9 +1,9 @@
-<div class="form-group">
+<div class="form-group form-group-sm">
 
 	<label class="control-label col-sm-6" for=""><?php echo $this->view['field_label']; ?></label>
 	
 	<div class="col-sm-6">
-		<p class="form-control-static"><?php echo wpsg_hspc($this->view['field_value']); ?></p>
+		<p class="form-control-static"><?php echo $this->view['field_value']; ?></p>
 	</div>
 	
 </div>
\ No newline at end of file
diff --git a/views/admin/includes.phtml b/views/admin/includes.phtml
index b5b8201..8f085cf 100644
--- a/views/admin/includes.phtml
+++ b/views/admin/includes.phtml
@@ -23,12 +23,12 @@
 <div style="padding:0px; margin:0px; float:left;">		
 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $_REQUEST['subaction']; ?>&amp;noheader=1">
 		
-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_css', __('Shop CSS styles nicht einbinden', 'wpsg'), $this->get_option('wpsg_load_css')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_load_css', __('Shop CSS styles nicht einbinden', 'wpsg'), $this->get_option('wpsg_load_css'), array('help' => 'wpsg_load_css')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_load_jquery', __('JQuery einbinden', 'wpsg'), $this->get_option('wpsg_load_jquery'), array('help' => 'wpsg_load_jquery')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_load_thickbox_js', __('Thickbox einbinden (JavaScript)', 'wpsg'), $this->get_option('wpsg_load_thickbox_js'), array('help' => 'wpsg_load_thickbox')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_load_thickbox_css', __('Thickbox einbinden (Styles)', 'wpsg'), $this->get_option('wpsg_load_thickbox_css'), array('help' => 'wpsg_load_thickbox')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_js', __('Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_js')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_css', __('CSS der Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_css')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_js', __('Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_js'), array('help' => 'wpsg_load_validierung')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_css', __('CSS der Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_css'), array('help' => 'wpsg_load_validierung')); ?>
 		
 		<?php $this->callMods('admin_includes'); ?>
 		
diff --git a/views/admin/index.phtml b/views/admin/index.phtml
index 848da7f..247f418 100644
--- a/views/admin/index.phtml
+++ b/views/admin/index.phtml
@@ -9,7 +9,7 @@
 
 <div class="wpsg_admin" id="wpsg-bs">
 
-	<nav class="navbar navbar-default navbar-admin navbar-fixed-top">
+	<nav class="navbar navbar-default">
 		<div class="container-fluid">
 			<div class="navbar-header">
 				<a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>
@@ -25,8 +25,8 @@
 					
 					<li role="presentation" class="<?php echo (($this->view['actionName'] == 'news')?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=news">
 						<?php echo __('Aktuelles', 'wpsg'); ?>
-						<?php if (wpsg_isSizedInt($wpsg_news_unread = wpsg_news::countUnreadNews())) { ?>
-						<span class="badge" style="background-color:#D9534F;">4</span>
+						<?php $wpsg_news_unread = wpsg_news::countUnreadNews(); if (wpsg_isSizedInt($wpsg_news_unread)) { ?>
+						<span class="badge" style="background-color:#D9534F;"><?php echo sizeof($wpsg_news_unread); ?></span>
 						<?php } ?>			
 					</a></li>
 				</ul>
diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml
index 2febb89..85f2075 100644
--- a/views/admin/konfiguration.phtml
+++ b/views/admin/konfiguration.phtml
@@ -18,7 +18,7 @@
 		
 <div class="wpsg_admin_content form-horizontal">
 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=konfiguration&noheader=1'); ?>">
-  
+    
   		<?php if ($this->hasMod('wpsg_mod_core')) { ?>
   		
 			<?php if ($this->arLizenz['l'] == 0) { ?>
@@ -81,16 +81,10 @@
 			<div class="wpsg_clear"></div>
 		</div>
 		<?php } else { ?>
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<?php echo __("Installierte DB Version", "wpsg"); ?>:
-			</div>
-			<div class="wpsg_form_right">
-				<p><?php echo WPSG_VERSION; ?>&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=allgemein&amp;do=update&amp;submit=1&amp;noheader=1"><?php echo __("Aktualisieren", "wpsg"); ?></a></p>
-				<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" class="wpsg_form_help"></a>
-			</div>
-			<div class="wpsg_clear"></div>
-		</div>	
+		<?php wpsg_drawForm_TextStart(); ?>		
+		<?php echo WPSG_VERSION; ?>&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=allgemein&amp;do=update&amp;submit=1&amp;noheader=1"><?php echo __("Aktualisieren", "wpsg"); ?></a>
+		<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" class="wpsg_form_help"></a>
+		<?php echo wpsg_drawForm_TextEnd(__('Installierte DB Version', 'wpsg')); ?>	
 		<?php } ?>
 		<br />
 		
diff --git a/views/admin/module.phtml b/views/admin/module.phtml
index a0a3a0c..9acd05c 100644
--- a/views/admin/module.phtml
+++ b/views/admin/module.phtml
@@ -8,12 +8,20 @@
 ?>
 <div class="wpsg_admin_submenu">
 	
+	<div class="wpsg_modul_search_wrap">
+		<input id="wpsg_modul_search" type="text" class="wpsg_modul_search" value="<?php echo wpsg_getStr($_COOKIE['wpsg-modulfilter-search']); ?>" />	
+		<label title="<?php echo __('Wenn aktiviert, werden nur aktive Module angezeigt'); ?>">
+			<input type="checkbox" <?php echo ((wpsg_isSizedString($_COOKIE['wpsg-modulfilter-check'], 'true'))?'checked="checked"':''); ?> id="wpsg_modul_onlyactive" class="wpsg_modul_onlyactive" />
+			<span class="glyphicon glyphicon-ok wpsg_modul_onlyactive_glyphicon" aria-hidden="true"></span>
+		</label>
+	</div>
+	
 	<?php foreach ($this->view['groups'] as $group_name => $g) { ?>
-	<div class="list-group">
-		<span class="list-group-head list-group-item"><?php echo $group_name; ?></span>		
+	<div class="list-group list-modul-group">
+		<span class="list-group-item list-group-head"><?php echo $group_name; ?></span>		
 		<?php foreach ($g as $mod_key => $m) { ?>
-		<a class="<?php echo (($this->get_option($mod_key, $this->view['global']) > 0)?'modul_akt':''); ?> list-group-item <?php echo (($mod_key == $_REQUEST['modul'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $mod_key; ?>">
-			<?php echo $m->name; ?>
+		<a class="<?php echo (($this->get_option($mod_key, $this->view['global']) > 0)?'modul_akt':''); ?> list-group-modul list-group-item <?php echo (($mod_key == $_REQUEST['modul'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $mod_key; ?>">
+			<span class="wpsg_modul_name"><?php echo $m->name; ?></span>
 			<?php if (($this->get_option($mod_key, $this->view['global']) > 0)?'modul_akt':'') { ?>
 			<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
 			<?php } ?>
@@ -25,7 +33,7 @@
 </div>
 
 <?php if (isset($_REQUEST['modul'])) { ?>
-<div class="wpsg_admin_content">		
+<div class="wpsg_admin_content form-horizontal">		
 	<form name="form1" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $_REQUEST['modul']; ?>&amp;noheader=1" method="post" enctype="multipart/form-data">
 		
 		<h3>
@@ -37,19 +45,9 @@
 		
 		<p><?php echo $this->arAllModule[$_REQUEST['modul']]->desc; ?></p>
 		
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<?php echo __("Modul aktiviert", "wpsg"); ?>:
-			</div>
-			<div class="wpsg_form_right">
-				<select name="aktiv">
-					<option value="0"><?php echo __('Nein', 'wpsg'); ?></option>
-					<option value="1" <?php echo (($this->get_option($_REQUEST['modul'], $this->view['global']) > 0)?'selected="selected"':''); ?>><?php echo __('Ja', 'wpsg'); ?></option>					
-				</select>
-			</div>
-			<div class="wpsg_clear"></div>
-		</div>
-		 
+		<?php $modul_install = $this->get_option($_REQUEST['modul'], $this->view['global']); ?>
+		<?php echo wpsg_drawForm_Select('aktiv', __('Modul aktiviert', 'wpsg'), array('0' => __('Nein', 'wpsg'), '1' => __('Ja', 'wpsg')), ((wpsg_isSizedInt($modul_install))?'1':'0')); ?>
+		 		 
 		<?php if (isset($this->arAllModule[$_REQUEST['modul']]->version)) { ?>
 		<?php echo wpsg_drawForm_Input('', __('Version', 'wpsg'), $this->arAllModule[$_REQUEST['modul']]->version, array('text' => true)); ?>		
 		<div class="wpsg_form_field">
@@ -128,10 +126,63 @@
 
 <script type="text/javascript">/* <![CDATA[ */
 
+	function wpsg_ssh_module()
+	{
+
+		jQuery('.list-modul-group').show();
+		jQuery('.wpsg_admin_submenu .list-group-item').show();
+
+		var check = jQuery('#wpsg_modul_onlyactive').prop('checked');
+		var search = jQuery('#wpsg_modul_search').val();
+
+		jQuery.cookie('wpsg-modulfilter-check', check);
+		jQuery.cookie('wpsg-modulfilter-search', search);
+		
+		jQuery('.wpsg_modul_name').each(function() {
+
+			if (!jQuery(this).parent().hasClass('active'))
+			{
+			
+				if (check && !jQuery(this).parent().hasClass('modul_akt')) jQuery(this).parent().hide();
+				else if (search != '')
+				{
+	
+					var re = new RegExp(search, 'i');
+	
+					if (!jQuery(this).html().match(re)) jQuery(this).parent().hide();
+					else jQuery(this).parent().show();
+						
+				}
+
+			}
+				
+		} ); 
+
+		jQuery('.list-modul-group').each(function() {
+
+			if (jQuery(this).find('.list-group-modul:visible').length <= 0) jQuery(this).hide();
+			else jQuery(this).show();				
+			
+		} );
+		
+	}
+
 	jQuery(document).ready(function() {
 
+		jQuery('#wpsg_modul_onlyactive').bind('change', function(event) {
+
+			wpsg_ssh_module();			
+			jQuery(this).blur();
+			
+		} );
+
+		jQuery('#wpsg_modul_search').focus().bind('blur', wpsg_ssh_module);
+		jQuery('#wpsg_modul_search').focus().bind('keyup', wpsg_ssh_module);
+		
 		jQuery('.wpsg_form_help').tipTip();
 
+		wpsg_ssh_module();
+		
 	} );
 
 /* ]]> */</script>
\ No newline at end of file
diff --git a/views/css/admin.css b/views/css/admin.css
index 84e2e58..14f2f94 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -1,693 +1,27 @@
-/*
- * Diese Datei wird immer im Backend geladen. Hier sollten die Admin CSS Einstellungen rein, die nichts mit den Themes zu tun haben
- */
-
-/*
- * Allgemein
- */
-.msg_wrap img { margin-bottom:1rem; margin-top:1rem; max-width:100%; height:auto; } 
-.wpsg_error { color:#FF0000; font-weight:bold; }
-.wpsg_developer { color:#FF0000; }
-.wpsg_change_error { background-color:#EE3B3B !important; }
-.wpsg_erfolg { color:green; }
-.wpsg_hinweis { font-style:italic; }
-.wpsg_table .odd td { background-color:#DEDEDE; }
-.wpsg_table .even td { }
-.wpsg_message img { float:right; }
-#wikipage h1 { line-height:100%; font-size:13px; }
-.wpsg_placeholder { border-style: dashed; border-width: 1px; height: 26px; margin: 0 auto 20px; }
-#icon-wpsg-Admin { background-image:url("../../../../../wp-admin/images/icons32.png"); background-position: -370px -5px; }
-/*.tablenav-pages-wrap { width:300px !important; }*/
-.tooltip { text-decoration:none; color:inherit; cursor:inherit; }
-.tooltip:hover { color:inherit; }
-.sortable_handler { cursor:move; }
-.toplevel_page_wpsg-Admin .settings-error { display:none; }
-
-/*
- * Datepicker
- */
-.ui-datepicker { width: 17em; padding:0; display: none; border:1px solid #444444; background-color:#F1F1F1; }
-.ui-datepicker-header { color:#FFFFFF; background-color:#444444; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-icon { width: 16px; height: 16px; background-image: url('../../lib/ui/smoothness/images/ui-icons_888888_256x240.png'); }
-.ui-datepicker .ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-datepicker .ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/*
- * Allgemein Icons ...
- */
- .branch-3-8 #adminmenu .toplevel_page_wpsg-Admin .wp-menu-image:before { content: "\f174"; }
- .branch-3-8 #adminmenu .toplevel_page_wpsg-Admin .wp-menu-image img { position:absolute; left:-100px; top:-100px; height:1px; width:1px; }
- 
-.wpsg_icon { display:block; width:16px; height:16px; float:left; margin-right:4px; background-repeat:no-repeat; background-position:50% 50%; }
-.wpsg_icon_center { margin:auto; }
-.wpsg_icon_right { float:right; }
-.wpsg_icon_add { background-image:url('../gfx/add.png'); }
-.wpsg_icon_edit { background-image:url('../gfx/edit.png'); }
-.wpsg_icon_html { background-image:url('../gfx/html.png'); }
-.wpsg_icon_remove { background-image:url('../gfx/delete.png'); }
-.wpsg_icon_plzedit { background-image:url('../gfx/edit.png'); width:32px; margin-right:5px; }
-.wpsg_form_language img { margin-left:2px; margin-top:5px; margin-right:5px; }
-.wpsg_form_language a { text-decoration:none; }
-.cluetip-inner img { max-width:100%; }
-
-/* Link Klassen */
-.wpsg_link_add { background-image:url('../gfx/add.png'); padding-left:20px; background-repeat:no-repeat; line-height:20px; background-position:left 50%; height:20px; display:block; }
-
-/*
- * Admin 
- */
-.wpsg_admin_theme { width:600px; border: 1px solid #AAAAAA; border-bottom-left-radius:6px; border-bottom-right-radius:6px; border-top-left-radius: 6px; border-top-right-radius: 6px; padding:10px; margin-bottom:10px; }
-.wpsg_admin_theme_akt { background-color:#FFFFFF !important; }
-.wpsg_admin_theme_image { width:75px; height:75px; border:1px solid #AAAAAA; float:left; }
-.wpsg_admin_theme_content { float:left; margin-left:10px; }
-.wpsg_admin_theme_name { font-weight:bold; font-size:14px; }
-.wpsg_admin_theme_info { color:#555555; }
-.wpsg_admin_theme_new { width:600px; border: 1px solid #AAAAAA; border-bottom-left-radius:6px; border-bottom-right-radius:6px; border-top-left-radius: 6px; border-top-right-radius: 6px; padding:10px; margin-bottom:10px; }
-.wpsg_admin_theme_new .button { float:right; }
-.wpsg_admin_topmenu { border-top: 1px solid #AAAAAA; }
-.wpsg_admin_topmenu ul { margin-top: -1px; list-style: none; width: 100%; margin-bottom: 10px; }
-.wpsg_admin_topmenu li { padding: 0px; margin: 0px; display: inline; }
-.wpsg_admin_topmenu li a { display: block; float: left; padding-left: 12px; padding-right: 12px; font: 11px/ 18px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; color: #21759B; line-height: 30px; text-decoration: none !important; }
-.wpsg_admin_topmenu li.current a { background-image: url("../gfx/tab_top.gif"); background-repeat: no-repeat; background-position: top center; }
-.wpsg_admin_topmenu li a:hover { }
-.wpsg_admin_submenu { float:left; width:200px; }
-.wpsg_admin_submenu .head { cursor:pointer; margin-left:0px; width:180px; line-height:18px;   border-style: solid solid none; border-top-left-radius: 6px; border-top-right-radius: 6px; border-width: 1px 1px 0; border-color:#AAAAAA; color: #21759B; cursor:pointer !important; background-color:#F1F1F1; }
-.wpsg_admin_submenu .title { float:left; padding:5px; padding-left:12px; }
-.wpsg_admin_submenu .toggle { clear: right; cursor: default; float: right; height:26px; margin: 1px 0 0; padding: 1px 2px 0 0; width: 22px; cursor:pointer !important; }
-.wpsg_admin_submenu ul { border-bottom:1px solid #AAAAAA; border-right: 1px solid #AAAAAA; width: 181px; float: left; padding: 0px; margin: 0px; margin-left:0px; }
-.wpsg_admin_submenu ul li { border-left: 1px solid #AAAAAA; margin: 0px; }
-.wpsg_admin_submenu ul li.current { background-color: #F5F5F5; border-left: 0px; border-left:1px solid #AAAAAA; }
-.wpsg_admin_submenu ul li a { display: block; padding-left: 12px; font: 11px/ 18px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; color: #21759B; line-height: 20px; text-decoration: none !important; }
-.wpsg_admin_submenu ul li a:hover { background-color: #EAF2FA; } 
-.wpsg_admin_submenu ul li.modul_akt a { background-image: url("../gfx/tick.png"); background-position: right center; background-repeat: no-repeat; font-weight: bold !important; width: 165px; }
-.wpsg_admin_content { float:left; }
-.wpsg_admin_box { width:770px; }
-.wpsg_admin_box .title { line-height:18px; padding:0px; border-style: solid solid none; border-top-left-radius: 6px; border-top-right-radius: 6px; border-width: 1px 1px 0; border-color:#AAAAAA; color: #21759B; cursor:pointer !important; background-color:#F1F1F1; }
-.wpsg_admin_box .content { border-bottom:1px solid #AAAAAA; border-right:1px solid #AAAAAA; border-left:1px solid #AAAAAA; min-height:18px; padding:5px; padding-left:12px; }
-.wpsg_admin_box .head .title { cursor:default !important; }
-.wpsg_admin_box .head .title .tab { cursor:pointer; float:left; padding-left:12px; padding-right:15px; border-right:1px solid #AAAAAA; padding-top:5px; padding-bottom:5px; }
-.wpsg_admin_box .head .title .tabright { float:right; border-left:1px solid #AAAAAA; border-right:0px; }
-.wpsg_admin_box .head .title .tab:first-child { border-top-left-radius:6px; }
-.wpsg_admin_box .head .title .tabright-last { border-top-right-radius:6px !important; }
-.wpsg_admin_box .head .title .tab:hover, .wpsg_admin_box .head .title .akttab { background-color:#FFFFFF; }
-.wpsg_admin_box .head .title .fulltab { cursor:pointer; padding:5px 5px 5px 12px; }
-.wpsg_admin_box .head .title .tablink { padding:5px; float:right; }
-.wpsg_admin_date_from { margin-right:4px;}
-.wpsg_admin_date_to { margin-right:4px; margin-left:25px; }
-.wpsg_clear { clear:both; }
-.wpsg_form_field { width:770px; 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:350px; float:left; }
-.wpsg_form_field .wpsg_form_right { width:420px; 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 label { line-height:25px; }
-.wpsg_form_field_max select { width:100%; }
-.postbox .wpsg_form_field .wpsg_form_left  { width:330px; } /* z.B. Bestellverwaltung Bankalignment Modul */
-.wpsg_order_top { }
-.wpsg_order_top .wpsg_form_field { width:100%; }
-.wpsg_order_top .wpsg_form_field .wpsg_form_left { max-width:200px; width:50% !important; }
-.wpsg_order_top .wpsg_form_field .wpsg_form_right { width:50% !important; }
-.wpsg_order_top .wpsg_form_field .wpsg_form_right select { width:50%; float:left; }  
-.wpsg_admin_box .wpsg_form_field { margin-bottom:0px; }
-.wpsg_admin_box .wpsg_form_field .wpsg_form_right { width:401px ; }
-.wpsg_form_field .wpsg_form_right_unit select, .wpsg_form_field .wpsg_form_right_unit input, .wpsg_form_field .wpsg_form_right_unit textarea { width:80%; float:left; }
-.wpsg_form_field .wpsg_form_right_unit p.wpsg_unit { width:15%; float:left; }
-.wpsg_form_field .wpsg_form_right textarea { height:100px; }
-.wpsg_form_field .wpsg_form_right input.checkbox { width:auto !important; float:left; margin-left:2px; margin-top:5px; }
-.wpsg_form_field .wpsg_form_right p { padding:4px 0px 4px 6px; margin:0px; }
-.wpsg_formfield_small .wpsg_form_left { line-height:12px; }
-.wpsg_formfield_small .wpsg_form_right p { line-height:12px; padding-top:0px; padding-bottom:0px; }
-.widget-inside .wpsg_form_field { width:100%; }
-.widget-inside .wpsg_form_left { width:100%; }
-.widget-inside .wpsg_form_right { width:100%; }
-.widget-inside .wpsg_form_field .wpsg_form_right select, 
-.widget-inside .wpsg_form_field .wpsg_form_right input,
-.widget-inside .wpsg_form_field .wpsg_form_right textarea { width:100%; }  
-.timestamp-wrap input, .timestamp-wrap select { width:auto !important; }
-.produktwrap .wpsg_form_field { width:780px; }
-.produktwrap .wpsg_form_left { width:380px; }
-.produktwrap .wpsg_form_right { width:400px; }
-.wpsg_form_help { right:0px; top:4px; position:absolute; display:block; width:16px; height:16px; background-image:url('../gfx/help.png'); }
-.widget-content .wpsg_form_help { position:relative; float:right; margin-top:-2px; }
-.wpsg_form_help_notip { right:0px; top:4px; position:absolute; display:block; width:16px; height:16px; background-image:url('../gfx/help.png'); }
-.wpsg_admin_content { padding:0px; margin:0px; float:left; width:750px; }
-.wpsg_admin_content h3 { position:relative; }
-.wpsg_admin_table { width:100%; }
-.wpsg_admin_box .wpsg_admin_table { margin-left:-3px; } 
-.wpsg_admin_table th { font-weight:bold; text-align:left; padding:3px; }
-.wpsg_admin_table td { padding:3px; } 
-.wpsg_admin_wpsg_list .col_name { }
-.wpsg_admin_wpsg_list .col_value { width:100px; }
-.wpsg_admin_wpsg_list .col_aktion { width:50px; }
-.wpsg_editable { border-bottom:1px dotted #666666; cursor:pointer; }
-.wpsg_editable input, .wpsg_editable select { height:24px !important; font-size:12px; }
-.wpsg_editable input { width:100%; }
-.wpsg_pflichtfelder { border-spacing:0px; width:100%; }
-.wpsg_pflichtfelder td { padding:0px; }
-.wpsg_pflichtfelder tr th { text-align:left; }
-.wpsg_pflichtfelder td.col1 select, 
-.wpsg_pflichtfelder td.col1 input { width:100%; }
-.wpsg_customfields { border-spacing:0px; width:100%; }
-.wpsg_customfields td { padding:0px; }
-.wpsg_customfields tr th { text-align:left; }
-.wpsg_customfields td select { width:100%; }
-.wpsg_customfields .col0 { width:45px; }
-.wpsg_customfields .col1 { width:305px; }
-.wpsg_customfields .col4 { width:25px; }
-.wpsg_customfields .col5 { text-align:center; }
-.wpsg_customfields .col2345 input { width:100%; }
-table.wpsg_admin_laender_list { font-size:12px; }
-table.wpsg_admin_laender_list tr.odd td { background-color:#DEDEDE; }
-table.wpsg_admin_laender_list tr.even td {}
-.wpsg_admin_laender_list .col_vz { width:100px; } 
-.wpsg_admin_laender_list .col_default { width:75px; text-align:center; }
-.wpsg_admin_laender_list .col_mwst { width:55px; }
-.wpsg_admin_laender_list .col_mwstsetting { width:100px; } 
-.wpsg_admin_laender_list .col_action { width:40px; }
-.wpsg_mod_produktattribute_table { width:100%; table-layout:fixed; }
-.wpsg_mod_produktattribute_table .col_id { width:25px; text-align:left; }
-.wpsg_mod_produktattribute_table .col_name { text-align:left; }
-.wpsg_mod_produktattribute_table .col_typ { width:100px; text-align:left; }
-.wpsg_mod_produktattribute_table .col_typ select { width:100%; }
-.wpsg_mod_produktattribute_table .col_html { width:35px; }
-.wpsg_mod_produktattribute_table .col_aktion { width:50px; text-align:center; }
-.wpsg_dialog { padding:10px; }
-.wpsg_code { background-color:#EFEFEF; border:1px solid #000000; padding:3px; margin-top:5px; margin-bottom:5px; font-family:monospace; font-size:12px; }
-.wpsg_tablerow td { padding:2px 0px 2px 0px; }
-.wpsg_odd:hover, .wpsg_even:hover, .wpsg_tablerow:hover, .wpsg_tablerow:hover td, .wpsg_tablerow_hover, .wpsg_tablerow_hover td { background-color:#EFEFEF !important; }
-.wpsg_odd td {  }
-.wpsg_even td {  }
-.wpsg_widerrufstext .wpsg_form_field .wpsg_form_left { width:270px; }
-.wpsg_widerrufstext .wpsg_form_field .wpsg_form_right { width:500px; }
-.wpsg_widerrufstext .wpsg_form_field .wpsg_form_right textarea { height:200px; }
-.tabcontent .wpsg_form_right { width:400px; }
-.tabcontent .wpsg_form_right input, .tabcontent .wpsg_form_right select { width:94%; } 
-.wpsg_mail_head { border-bottom:1px solid #AAAAAA; }
-.wpsg_mail_content, wpsg_admin_box_content { display:none; }
-.wpsg_handlediv .handlediv { position:absolute; right:0px; top:0px; }
-.wpsg_handlediv span a.wpsg_form_help { float:left; display:block; position:relative; top:0px; margin-right:5px; }
-.wpsg_register_modullist { width:100%; }
-.wpsg_register_modullist th { text-align:left; }
-.wpsg_register_modullist .wpsg_col_aktion { text-align:right; }
-.wpsg_modultable { width:100%; }
-.wpsg_modultable tr th { text-align:left; }
-.wpsg_modultable tr .wpsg_col_name { padding-right:25px; }
-.wpsg_modultable tr .wpsg_col_instversion { padding-right:25px; }
-.wpsg_modultable tr .wpsg_col_licence { padding-right:25px; }
-.wpsg_modultable tr .wpsg_col_availableversion { padding-right:25px; }
-.wpsg_admin_vz_list .col_aktion .wpsg_icon_remove { float:right; }
-.wpsg_admin_vz_list .col_aktion { width:75px; }
-.wpsg_admin_vz_list .col_innereu { text-align:center; width:75px; }
-.navbar-admin { left:180px; top:32px; margin-top:-5px; margin-bottom:20px; margin-left:-25px; }
-.navbar-admin .navbar-brand { padding-left:-10px; text-align:center; width:240px; }
-.navbar-nav li { margin-bottom:0px; }
-.wpsg_admin { padding-top:75px; }
-.wpsg_admin_submenu .list-group-item { padding-top:3px; padding-bottom:3px; }
-.wpsg_admin_submenu .list-group-item .glyphicon { float:right; color:#2b542c; }
-.wpsg_admin_submenu .list-group-head { background-color:#E1E1E1 !important; padding-top:10px; padding-bottom:10px; }
-.wpsg_admin_submenu .modul_akt { background-color:#DFF0D8; } 
-.wpsg_admin_content { margin-left:15px; }
-
-/*
- * Dialog im Backend
- * z.B. Änderung der Adresse in Bestellverwaltung
- */
-.wpsg_dialog { }
-.wpsg_dialog_content { margin:10px; }
-.wpsg_dialog .wpsg_form_field { box-sizing:border-box; padding-left:5px; padding-right:5px; width:100%; }
-.wpsg_dialog .wpsg_form_field input, .wpsg_dialog .wpsg_form_field select { width:100%; box-sizing:border-box; }
-.wpsg_dialog .wpsg_form_field .wpsg_form_left { width:50%; }
-.wpsg_dialog .wpsg_form_field .wpsg_form_right { width:50%; }
-
-/*
- * Seitenrefresh im Backend
- * z.B. in der Bestellverwaltung 
- */
-#wpsg_backend_loading { position:fixed; z-index:100000; width:100%; height:100%; left:0px; top:0px; background-color:rgba(0, 0, 0, 0.75); } 
-#wpsg_backend_loading .wpsg_inner { color:#FFFFFF; font-size:2rem; margin:auto; text-align:center; margin-top:20%; }
-
-/*
- * Produktverwaltung
- */
-.wpsg_produktindex .wpsg_pic_col { width:50px; }
-.wpsg_produktindex #wpsg_product_search_button { background-position:50% 50%; background-repeat:no-repeat; background-image:url('../gfx/lupe.png'); }
-.wpsg_produkt_addedit .wpsg_form_field { width:100%; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_left { width:20%; font-weight:bold; line-height:24px; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right { width:80%; float:left; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right input { width:100%; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right textarea { width:100%; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right_unit input { width:95%; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right .wp-editor-wrap input { width:auto !important; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right_unit p.wpsg_unit { width:4%; float:right; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right input.wpsg-datepicker { width:85%; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right .ui-datepicker-trigger { margin-left:3px; margin-top:5px; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right select { width:100%; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right_help select { width:95%; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right input.wpsg_preis { width:60%; }
-.wpsg_produkt_addedit .wpsg_form_field .wpsg_form_right .waehrung { float:right; }
-.wpsg_produkt_addedit #side-info-column .wpsg_form_field .wpsg_form_left { width:50%; }
-.wpsg_produkt_addedit #side-info-column .wpsg_form_field .wpsg_form_right { width:50%; }
-.wpsg_posturl { margin-bottom:5px; }
-
-/*
- * Bestellverwaltung
- */
-.wpsg_order_datum { color:#999999; }
-.wpsg_order_adress { color:#999999; }
-.wpsg_order_view .inner-sidebar .wpsg_form_field { width:100%; }
-.wpsg_order_view .inner-sidebar .wpsg_form_field .wpsg_form_left { width:100%; }
-.wpsg_order_view .inner-sidebar .wpsg_form_field .wpsg_form_right { width:100%; margin-top:-5px; }
-.wpsg_order_view #post-body-content .wpsg_form_field { width:100%; }
-.wpsg_order_view #post-body-content .wpsg_form_field .wpsg_form_left { width:20%; min-width:200px; }
-.wpsg_order_view #post-body-content .wpsg_form_field .wpsg_form_right { width:auto; }
-.wpsg_order_view .wpsg_produkte { width:100%; }
-.wpsg_order_view tr.wpsg_kopf th { text-align:left; }
-.wpsg_order_view .wpsg_cell_preis { width:100px; text-align:right !important; padding-right:10px; }
-.wpsg_order_view .wpsg_cell_mwst { width:100px; text-align:right !important; padding-right:10px; }
-.wpsg_order_view .wpsg_cell_menge { width:100px; text-align:center !important; padding-right:10px; }
-.wpsg_order_view .wpsg_cell_gesamtpreis { width:100px; text-align:right !important; }
-.wpsg_order_view .wpsg_cell_summe_value { text-align:right !important; text-decoration:underline; }
-.wpsg_order_view .wpsg_cell_shipping_value { text-align:right !important; }
-.wpsg_order_view .wpsg_cell_payment_value { text-align:right !important; }
-.wpsg_order_view .wpsg_cell_payment_value { text-align:right !important; }
-.wpsg_order_view .wpsg_cell_rabatt_value { text-align:right !important; }
-.wpsg_order_view .wpsg_cell_mwst_value { text-align:right !important; }
-.wpsg_order_view .wpsg_cell_mwst_value, .wpsg_order_view  .wpsg_cell_mwst_label { font-size: 10px; line-height: 18px; }
-.wpsg_order_view .wpsg_cell_gesamt_value { text-align:right !important; font-weight:bold; text-decoration:underline; }
-.wpsg_order_view .wpsg_order_admincomment { width:100%; height:100px; }
-.wpsg_order_view .wpsg_order_admincomment_submit { margin-top:5px; margin-bottom:5px; }
-.wpsg_order_view #wpsg_generally .wpsg_form_left { width:200px; }
-.wpsg_orderlog { width:100%; }
-.wpsg_orderlog .col_date { width:135px; text-align:left; }
-.wpsg_orderlog .col_aktion { width:100px; text-align:right; }
-.wpsg_orderlog .col_title { text-align:left; }
-.wpsg_orderlog .col_mailtext { background-color:#FFFFFF; font-family:monospace; }
-.wpsg_orderlog .col_mailtext textarea { width:100%; height:250px; overflow:scroll; border:0px; background-color:#DSDSDS; border:1px solid #C4C4C4; overflow:auto; max-width:100%; }
-.wpsg_order_index_status { float:none !important; margin:0px 300px 0px 0px; }
-.wpsg_order_index_status .akt { font-weight:bold; color:#000000; }
-.wpsg_order_index_status li { float:left !important; }
-.wpsg_order_index_status li span { line-height:2; padding:0.2em; }
-.wpsg_tablenav { clear:right; float:right; }
-.wpsg-search-box { margin-top:-6px !important; }
-	
-/* 
- * Produktbilder
- */
-.wpsg_mod_produktbilder_admin_bild { float:left; margin-right:5px; }
-
-/*
- * Downloadprodukte
- */
-.wpsg_mod_downloadprodukte_admin_delete { height:16px; width:16px; float:right; background-image:url('../gfx/delete.png'); cursor:pointer; }
-
-/*
- * Kundenverwaltung
- */
-#wpsg_customercomment textarea, #postbox_kunde_kommentar textarea { width:100%; height:150px; }
-.wpsg_mod_kundenverwaltung_customeramount .wpsg_storno { color:#000000; }
-.wpsg_mod_kundenverwaltung_customeramount .wpsg_open { color:#FF0000; }
-.wpsg_mod_kundenverwaltung_customeramount .wpsg_payed { color:#008000; }
-.wpsg_customer_index .wpsg-row-actions > div { visibility:hidden; }
-.wpsg_customer_index .wpsg-row-actions:hover > div { visibility:visible; } /* Bug:? Chrome */
-
-/* Kundengruppenverwaltung */
-.wpsg_mod_kundenverwaltung_customergroup_index .col-id { width:55px; }
-.wpsg_mod_kundenverwaltung_customergroup_index .col-name { }
-.wpsg_mod_kundenverwaltung_customergroup_index .col-customercount { width:150px; }
-.wpsg_mod_kundenverwaltung_customergroup_index .col-calculation { width:150px; }
-.wpsg_mod_kundenverwaltung_customergroup_addedit .wpsg_form_field .wpsg_form_left  { width:100%; }
-.wpsg_mod_kundenverwaltung_customergroup_addedit .wpsg_form_field .wpsg_form_right  { width:100%; }
-
-/*
- * Versandarten
- */
-.va_table { width:100%; table-layout:fixed; border-collapse: collapse; }
-.va_table .wpsg_label { font-weight:bold; width:250px; padding:2px; }
-.va_table .wpsg_value { padding:2px; }
-.va_table .wpsg_delcol { position:relative; width:25px; text-align:right; padding:2px 0px 2px 2px; }
-.va_table .wpsg_delcol .wpsg_form_help { position:relative; }
-.va_table .wpsg_delcol a { float:right; }
-.va_table .wpsg_mwst_checkbox { width:20px; }
-
-/*
- * Rechnungsmoudl
- */
-.wpsg_mod_rechnungen_fieldtable { width:100%; } 
-.wpsg_mod_rechnungen_fieldtable th { text-align:left; }
-.wpsg_mod_rechnungen_fieldtable th.col_x, .wpsg_mod_rechnungen_fieldtable th.col_y { text-align:center; }
-.wpsg_mod_rechnungen_fieldtable .col_bezeichnung { width:100px; }
-.wpsg_mod_rechnungen_fieldtable .col_freitext { }
-.wpsg_mod_rechnungen_fieldtable .col_x { width:50px; }
-.wpsg_mod_rechnungen_fieldtable .col_y { width:50px; }
-.wpsg_mod_rechnungen_fieldtable .col_color { width:50px; }
-.wpsg_mod_rechnungen_fieldtable .col_groesse { width:50px; }
-.wpsg_mod_rechnungen_fieldtable .col_action { width:50px; }
-.wpsg_foottextlist { width:100%; }
-.wpsg_foottextlist th { text-align:left; }
-.col_standard { text-align:center; width:50px; } 
-
-/* Lieferscheinmodul (wpsg_mod_deliverynote) */
-.wpsg_mod_deliverynote_fieldtable { width:100%; } 
-.wpsg_mod_deliverynote_fieldtable th { text-align:left; }
-.wpsg_mod_deliverynote_fieldtable th.col_x, .wpsg_mod_rechnungen_fieldtable th.col_y { text-align:center; }
-.wpsg_mod_deliverynote_fieldtable .col_bezeichnung { width:100px; }
-.wpsg_mod_deliverynote_fieldtable .col_freitext { }
-.wpsg_mod_deliverynote_fieldtable .col_x { width:50px; }
-.wpsg_mod_deliverynote_fieldtable .col_y { width:50px; }
-.wpsg_mod_deliverynote_fieldtable .col_color { width:50px; }
-.wpsg_mod_deliverynote_fieldtable .col_groesse { width:50px; }
-.wpsg_mod_deliverynote_fieldtable .col_action { width:50px; }
-
-/*
- * Videodownload Modul
- */
-.wpsg_mod_videodownload_fieldtable { width:100%; } 
-.wpsg_mod_videodownload_fieldtable th { text-align:left; }
-.wpsg_mod_videodownload_fieldtable .col_bezeichnung { width:25px; }
-.wpsg_mod_videodownload_fieldtable .col_freitext_label { font-weight:bold; }
-.wpsg_mod_videodownload_fieldtable .col_freitext { }
-.wpsg_mod_videodownload_fieldtable .col_x { width:35px; }
-.wpsg_mod_videodownload_fieldtable .col_y { width:35px; }
-.wpsg_mod_videodownload_fieldtable .col_color { width:50px; }
-.wpsg_mod_videodownload_fieldtable .col_alpha { width:35px; }
-.wpsg_mod_videodownload_fieldtable .col_align { width:35px; text-align:center; }
-.wpsg_mod_videodownload_fieldtable .col_angle { width:50px; }
-.wpsg_mod_videodownload_fieldtable .col_groesse { width:50px; }
-.wpsg_mod_videodownload_fieldtable .col_font { width:150px; }
-.wpsg_mod_videodownload_fieldtable .col_font select { width:100%; }
-.wpsg_mod_videodownload_fieldtable .col_action { width:75px; }
-.wpsg_mod_videodownload_admin_delete { height:16px; width:16px; float:right; background-image:url('../gfx/delete.png'); cursor:pointer; }
-.wpsg_mod_videodownload_order_view_filelist { width:100%; }
-.wpsg_mod_videodownload_order_view_filelist .col_file { text-align:left; }
-.wpsg_mod_videodownload_order_view_filelist .col_status { text-align:left; }
-.wpsg_mod_videodownload_order_view_filelist .col_action { text-align:left; }
-.wpsg_mod_videodownload_order_view_filelist .row_raid td { color:red; }
-
-/*
- * PDFdownload Modul
- */
-.wpsg_mod_downloadplus_fieldtable { width:100%; } 
-.wpsg_mod_downloadplus_fieldtable th { text-align:left; }
-.wpsg_mod_downloadplus_fieldtable .col_bezeichnung { width:25px; }
-.wpsg_mod_downloadplus_fieldtable .col_freitext_label { font-weight:bold; }
-.wpsg_mod_downloadplus_fieldtable .col_freitext { }
-.wpsg_mod_downloadplus_fieldtable .col_x { width:35px; }
-.wpsg_mod_downloadplus_fieldtable .col_y { width:35px; }
-.wpsg_mod_downloadplus_fieldtable .col_color { width:50px; }
-.wpsg_mod_downloadplus_fieldtable .col_alpha { width:35px; }
-.wpsg_mod_downloadplus_fieldtable .col_align { width:35px; text-align:center; }
-.wpsg_mod_downloadplus_fieldtable .col_bg { width:35px; text-align:center; }
-.wpsg_mod_downloadplus_fieldtable .col_angle { width:50px; }
-.wpsg_mod_downloadplus_fieldtable .col_groesse { width:50px; }
-.wpsg_mod_downloadplus_fieldtable .col_font { width:150px; }
-.wpsg_mod_downloadplus_fieldtable .col_font select { width:100%; }
-.wpsg_mod_downloadplus_fieldtable .col_action { width:75px; }
-.wpsg_mod_downloadplus_admin_delete { height:16px; width:16px; float:right; background-image:url('../gfx/delete.png'); cursor:pointer; }
-.wpsg_mod_downloadplus_order_view_filelist { width:100%; }
-.wpsg_mod_downloadplus_order_view_filelist .col_file { text-align:left; }
-.wpsg_mod_downloadplus_order_view_filelist .col_status { text-align:left; }
-.wpsg_mod_downloadplus_order_view_filelist .col_action { text-align:left; }
-.wpsg_mod_downloadplus_order_view_filelist .row_raid td { color:red; } 
-.wpsg_mod_downloadplus_security input { float:left; width:auto !important; }
-.wpsg_mod_downloadplus .wpsg_border_bottom td { border-top:1px solid #DEDEDE; height:1	px; }
-
-/*
- * Variantenverwaltung
- */
-#wpsg_vp_drawVarianten div.wpsg_editable { width:auto; display:inline-block; }
-#wpsg_vp_drawVarianten .col_preis { width:150px; text-align:left; }
-#wpsg_vp_drawVarianten .col_fmenge { width:100px; text-align:left; }
-#wpsg_vp_drawVarianten .col_variname { width:350px; }
-#wpsg_vp_drawVarianten .col_variartnr { width:200px; text-align:left; }
-#wpsg_vp_drawVarianten .col_stock { width:100px; text-align:left; }
-#wpsg_vp_drawVarianten .wpsg_mod_varianten_productimage_row .pic { display:block; float:left; margin-right:5px; padding:5px; height:25px; width:25px; }
-#wpsg_vp_drawVarianten .wpsg_mod_varianten_productimage_row .mark { background-color:rgb(174, 174, 174); }
-#wpsg_vp_drawVarianten .wpsg_mod_varianten_orderwrap_image .wpsg_mod_varianten_productimage_row .mark:first-of-type { background-color:black; }
-#wpsg_vp_drawVarianten .wpsg_mod_varianten_ajaxloading { width:100%; height:100%; position:absolute; left:0px; top:0px; background-color:rgba(125, 125, 125, 0.5); margin-top:-10px; padding-bottom:21px; }
-#wpsg_vp_drawVarianten .wpsg_mod_varianten_ajaxloading img { position:absolute; left:50%; top:50%;  margin-left:-8px; margin-top:-5.5px; }
-
-/*
- * Gutscheinmodul
- */
-.wpsg_mod_gutschein .vouchertable { width:100%; }
-.wpsg_mod_gutschein .column-checkbox { width:25px; text-align:center; }
-.wpsg_mod_gutschein .column-nr { width:50px; text-align:left; }
-
-/*
- * Related Products
- */
-.wpsg_productselect { padding:15px; }
-.wpsg_productselect .wpsg_form_field { width:100%; }
-.wpsg_productselect .wpsg_form_left { width:50%; }
-.wpsg_productselect .wpsg_form_right { width:50%; }
-.wpsg_productselect .wpsg_form_right select { float:right; }
-#relatedproducts_list select { width:105px !important; }
-#relatedproducts_list .wpsg_icon { margin-top:5px; }
-
-/* Export Profile */
-#profil_content .wpsg_form_field { width:745px; }
-#profil_content .wpsg_form_field .wpsg_form_right { width:395px; min-height:24px; line-height:24px; }
-#profil_content #message { margin-left:0px; }
-#profil_content .wpsg_mod_export_fieldlist { width:100%; }
-#profil_content .wpsg_mod_export_fieldlist th { text-align:left; padding:2px 5px 2px 0px; }
-#profil_content .wpsg_mod_export_fieldlist td { text-align:left; padding:2px 5px 2px 0px; }
-#profil_content .wpsg_mod_export_fieldlist .odd td { background-color:#DEDEDE; }
-#profil_content .wpsg_mod_export_fieldlist .even { }
-#profil_content .wpsg_mod_export_col_field_user { font-weight:bold; }
-#wpsg_modexport .wpsg_mod_export_profillabel { margin-right:15px; display:block; float:left; }
-
-/* Produktvariablen */ 
-.wpsg_pv_table { width:100%; }
-.wpsg_pv_table tr td { vertical-align:top; }
-.wpsg_pv_table .wpsg_id { width:20px; text-align:left; cursor:move; }
-.wpsg_pv_table .wpsg_delcol { width:24px; text-align:center; }
-.wpsg_pv_table .wpsg_typ { width:100px; text-align:left; }
-.wpsg_pv_table .wpsg_pflicht { width:100px; text-align:center; }
-.wpsg_pv_table .wpsg_label { text-align:left; }
-
-/* Bestellvariablen */
-.wpsg_ov_table { width:100%; }
-.wpsg_ov_table .wpsg_id { width:20px; text-align:left; }
-.wpsg_ov_table .wpsg_delcol { width:24px; text-align:center; }
-.wpsg_ov_table .wpsg_typ { width:100px; text-align:left; }
-.wpsg_ov_table .wpsg_pflicht { width:100px; text-align:center; }
-.wpsg_ov_table .wpsg_label { text-align:left; }
-
-/* Statistikmodul */
-.wpsg_mod_statistics_totals_row { width:100%; }
-.wpsg_mod_statistics_totals_block { float:left; width:auto; text-align:center; font-family: Georgia,"Times New Roman","Bitstream Charter",Times,serif; }
-.wpsg_mod_statistics_totals_block .number { font-size:18px; color:#21759B; display:block; padding-bottom:10px; padding-top:5px; }
-.wpsg_mod_statistics_totals_block .label { font-size:16px; color:#8F8F8F; display:block; padding-bottom:5px; }
-.wpsg_mod_statistics_totals_block .label a { color:#8F8F8F; border-bottom:1px solid #ECECEC; padding-left:10px; padding-right:15px; padding-bottom:5px; }
-.subsubsub #table-data .th-right span { float:right; }
-.subsubsub #table-data .td-right { text-align:right; }
-
-/* Zahlvarianten */
-.zv_table { width:100%; table-layout:fixed; border-collapse: collapse; }
-.zv_table .wpsg_label { font-weight:bold; width:250px; padding:2px; }
-.zv_table .wpsg_value { padding:2px; }
-.zv_table .wpsg_delcol { width:25px; position:relative; text-align:right; padding:2px 0px 2px 2px; }
-.zv_table .wpsg_delcol .wpsg_form_help { position:relative; top:0px; }
-.zv_table .wpsg_delcol a { float:right; }
-.zv_table .wpsg_mwst_checkbox { width:20px; }
-
-/* Auftragsbest�tigung */
-.wpsg_order_view_auftragsbestaetigung { width:100%; }
-.wpsg_order_view_auftragsbestaetigung_submit { margin-top:5px; margin-bottom:5px; }
-
-/* Rabattmodul */
-.wpsg_mod_discount_generalcol { float:left; width:33%; }
-.wpsg_mod_discount_seriescol { float:left; width:50%; line-height:25px; vertical-align:middle; }
-.wpsg_mod_discount_seriescol_sub { width:25%; }
-.wpsg_mod_discount_seriescol input[type=text] { width:70% !important; }
-.wpsg_mod_discount_seriescol input[type=checkbox] { width:auto !important; margin-right:5px; }
-.wpsg_mod_discount_settings #wpsg_mod_discount_hierarchie ul { margin-top:0px; }
-.wpsg_mod_discount_settings #wpsg_mod_discount_hierarchie input[type="checkbox"] { width:auto; }
-.wpsg_mod_discount_settings #wpsg_mod_discount_hierarchie ul li { padding-left:5px; width:96%; line-height:25px; height:25px; background-color:#DDDDDD; cursor:move; }
-.wpsg_mod_discount_settings #wpsg_mod_discount_hierarchie ul li input { display:none; }
-
-/* Registrierung */
-.wpsg_registerform { padding:10px; }
-.wpsg_registersuccess { color:green; }
-.wpsg_registerfailure { color:red; }
-
-/* Berechtigungsverwaltung */
-.wpsg_access_table { width:100%; table-layout:fixed; margin-top:50px; }
-.wpsg_access_table .wpsg_col_capname { width:150px; padding-right:25px; }
-.wpsg_access_table th.wpsg_col_cap { -webkit-transform: rotate(-90deg); -moz-transform: rotate(-90deg); height:40px; text-align:center; width:25px; }
-.wpsg_access_table td.wpsg_col_cap { text-align:center; }
-
-/* Gutscheinproduktmodul */
-.wpsg_mod_voucherproduct_list .wpsg_mod_voucherproduct_code { float:left; }
-.wpsg_mod_voucherproduct_list .wpsg_mod_voucherproduct_status { width:auto; float:right; text-align:right; }
-#wpsg_voucherproduct_target .wpsg_button { float:left; }
-
-/* Statistimodul */
-#wpsg_statistics_form .wpsg_form_field .wpsg_form_left { width:70px; }
-.wpsg-table-data-wrapper { float:left; margin-right:15px; }
-td.jqplot-table-legend { vertical-align:middle !important; white-space:no-wrap !important; }
-.orderdown .sorting-indicator { background-image: url("../../../../../wp-admin/images/sort.gif"); background-position:0% 50%; display:inline-block; height:10px; width:7px; }
-.orderup .sorting-indicator { background-image: url("../../../../../wp-admin/images/sort.gif"); background-position:100% 50%; display:inline-block; height:10px; width:7px; }
-.orderdown span, .orderup span { cursor: pointer; float:none !important; }
-
-/* Bankabgleichsmodul (mod_bankalignment) */
-.wpsg_mod_bankalignment_order_ajax .row-details { font-family:monospace; display:none; }
-
-/* E-Bay Schnittstelle (mod_ebay) */
-#wpsg_mod_ebay_categorieselect_dialog { padding:10px; }
-#wpsg_mod_ebay_categorieselect_dialog select { width:100%; }
-#wpsg_mod_ebay_categorietext { float:left; }
-.wpsg_mod_ebay_cattarget img { margin-top:5px; }
-
-/* Staffelpreismodul (mod_scaleprice) */
-.wpsg_mod_scaleprice_label_scale { float:left; width:25%; font-weight:normal; }
-.wpsg_mod_scaleprice_label_value { float:right; width:25%; text-align:center; font-weight:normal; }
-.wpsg_mod_scaleprice_value { width:48% !important; float:left !important; }
-.wpsg_mod_scaleprice_scale { width:48%; float:left; }
-.wpsg_mod_scaleprice_row .wpsg_form_left .wpsg_editable { width:48%; float:left; text-align:right; font-weight:normal; }
-.wpsg_mod_scaleprice_row .wpsg_form_right .wpsg_editable { line-height: 24px; text-align:right; width:48%; float:left; font-weight:normal; }
-#wpsg_mod_scaleprice_target p.waehrung { width:25%; float:left; padding-top:3px; }
-#wpsg_mod_scaleprice_target .wpsg_icon_add { margin-top:3px; }
-#wpsg_mod_scaleprice_target .wpsg_icon_remove { margin-top:3px; }
-
-/* H�ndlerbund (mod_haendlerbund) */
-.wpsg_mod_haendlerbund_settings .wpsg_mod_haendlerbund_date { float:right; line-height:25px; margin-right:25px; }
-
-/* Rechtstexte */
-.wpsg_ps_update input[type="checkbox"] { width:auto !important; margin-top:5px; margin-right:5px; float:left; }
-
-/* Micropayment (mod_micropayment) */
-#wpsg_mod_micropayment_handypay_infolayer, #wpsg_mod_micropayment_call2pay_infolayer { line-height:0.65rem; padding-top:0.5rem; padding-bottom:0.5rem; }
-#wpsg_mod_micropayment_handypay_infolayer ul, #wpsg_mod_micropayment_call2pay_infolayer ul { list-style:circle; margin-left:15px; }
-
-.wpsg_mod_test_table table { width:100%; }
-.wpsg_mod_test_table table th { text-align:left; font-size:12px; line-height:16px; }
-.wpsg_mod_test_table table td { test-align:left; font-size:12px; line-height:16px; }
-
-/* Hilfetooltip */
-.cluetip-title { background-color:#767676 !important; color:#FFFFFF !important; }
-.cluetip-title a { color:#FFFFFF !important; }
-.cluetip-inner { background-color: #F7F7F7; }
-.clue-left-default .cluetip-arrows { background-image:url('../gfx/darrowright.gif') !important; margin-top:5px !important; }
-.clue-right-default .cluetip-arrows { background-image:url('../gfx/darrowleft.gif') !important; margin-top:5px !important; }
-
-/* Bankeinzug (wpsg_mod_autodebit) */
-input.wpsg_mod_autodebit_button { width:100% !important; }
-
-/* 3.8 Kompatibilit�t */
-.version-3-8 .wpsg_order_view .inner-sidebar .wpsg_form_field .wpsg_form_left { width:40%; }
-.version-3-8 .wpsg_order_view .inner-sidebar .wpsg_form_field .wpsg_form_right { width:60%; }
-
-/* Modul "Wirecard" */
-.wpsg_mod_wirecard_paymenttypeselect input[type="checkbox"] { width:auto; margin-left:5px; margin-top:-3px; }
-.wpsg_mod_wirecard_paymenttypeselect li { padding-left:5px; width:100%; line-height:25px; height:25px; background-color:#DDDDDD; cursor:move; }
-
-/* Modul "Bestellbedingungen" */
-.wpsg_mod_ordercondition_text { width:100%; height:300px; }
-
-/* Modul "Kundenkontakt" */
-#kk_text { font-family:"Courier New"; }
-
-/* Rechtstexte */
-.wpsg_mod_legaltexts_protectedshops_table { width:100%; }
-.wpsg_mod_legaltexts_protectedshops_table th { text-align:left; width:343px; }
-.wpsg_ps_update { float:right; }
-.wpsg_ps_status { float:left; }
-select.wpsg_ps_page { width:73%; }
-select.wpsg_ps_format { float:right; width:23%; }
-#wpshopgermany_ts_shopid { width:100%; }
-#wpsgitrecht_message { margin-left:5px; }
-.wpsgitrecht_clear { clear:both; }
-.wpsgitrecht_form_field { width:770px; margin-bottom:5px; }
-.wpsgitrecht_form_field .wpsgitrecht_form_left { line-height:24px; font-weight:bold; width:350px; float:left; }
-.wpsgitrecht_form_field .wpsgitrecht_form_right { width:420px; float:left; position:relative; line-height:28px; }
-.wpsgitrecht_form_field .wpsgitrecht_form_right select, .wpsgitrecht_form_field .wpsgitrecht_form_right input { width:95%; }
-.wpsgitrecht_form_field .wpsgitrecht_form_right input.checkbox { width:auto !important; float:left; margin-left:2px; margin-top:5px; }
-.wpsgitrecht_form_field .wpsgitrecht_form_right p { padding:4px 0px 4px 6px; margin:0px; }
-.wpsgitrecht_form { padding:10px; }
-.wpsgitrecht_date { float:right; padding-right:5%; }
-.wpsgitrecht_hinweis { font-style:italic; }
-.wpsgitrecht_table { border-spacing:0px; border-collapse:collapse; }
-.wpsgitrecht_table .col0 { width:347px; }
-.wpsgitrecht_table .col1 { width:400px; }
-.wpsgitrecht_table .col1 p { padding:2px 0px 2px 10px; display:inline-block; margin:0px; }
-.wpsgitrecht_table .col1 select { width:100%; }
-.wpsg_itrecht_generatebutton { width:16px; height:16px; background-image:url('../gfx/arrow_refresh_small.png'); ?>); display:inline-block; float:right; margin-top:6px; }
-
-/* Modul "Paketverfolgung" */
-.wpsg_mod_packagetracking_settings_edit_list .trackingprovider_table { width:100%; table-layout:fixed; border-collapse: collapse; }
-.wpsg_mod_packagetracking_settings_edit_list .trackingprovider_table .wpsg_label { font-weight:bold; width:150px; padding:2px; }
-.wpsg_mod_packagetracking_settings_edit_list .trackingprovider_table .wpsg_value { padding:2px; }
-.wpsg_mod_packagetracking_settings_edit_list .trackingprovider_table .wpsg_delcol { position:relative; width:25px; text-align:right; padding:2px 0px 2px 2px; }
-.wpsg_mod_packagetracking_settings_edit_list .trackingprovider_table .wpsg_delcol .wpsg_form_help { position:relative; }
-.wpsg_mod_packagetracking_settings_edit_list .trackingprovider_table .wpsg_delcol a { float:right; }
-.wpsg_mod_versandarten_packagetracking .wpsg_mod_packagetracking_provider { width:100%; }
-
-/* Modul CrefoPay */
-.wpsg_mod_crefopay_order_sidebar .button { margin-right:5px; margin-top:5px; float:left; }
-.wpsg_mod_crefopay_mnsstatemapping { display:none; }
-.wpsg_mod_crefopay_mnsstatemapping .wpsg_form_field { margin-bottom:0px; }
-
-/* Modul TrustedShops */
-.wpsg_mod_protectedshops #wpsg_mod_trustedshops_reminderDays { width:50px; float:left; margin-right:5px; }
-.wpsg_mod_protectedshops .wpsg_form_field .wpsg_form_trustedshops_reminderDays p { float:left; padding-right:5px; padding-left:2px; } 
- 
-/* News Bereich */
-.wpsg_news_wrap {}
-.wpsg_news_wrap .wpsg_news .markRead { text-align:right; width:100px; display:none; position:absolute; right:15px; top:15px; }
-.wpsg_news_wrap .wpsg_news_read .markRead img { float:right; margin-left:5px; }
-.wpsg_news_wrap .wpsg_news { width:100%; box-sizing:border-box; position:relative; padding:5px 10px 10px 10px; margin-bottom:15px; background-color:#FFFFFF; }
-.wpsg_news_wrap .wpsg_news h2 a { text-decoration:none; color:inherit !important; }
-.wpsg_news_wrap .wpsg_news_read {  }
-.wpsg_news_wrap .wpsg_news_read .markRead { display:block; }
-.wpsg_news_unreadhint { color:#FFFFFF; background-color:#FF0000; padding:0px 4px; line-height:16px; font-size:8px; display:inline-block; font-weight:bold; border-radius:15px; width:8px; text-align:center; vertical-align:top; margin-top:4px; margin-left:0px; }
-
-
-
+/* Allgemein */
+
+/* Konfiguration */
+.wpsg_admin { margin-top:20px; }
+.wpsg_admin_wrap { position:relative; }
+.wpsg_admin_submenu { width:180px; float:left; }
+.wpsg_admin_content { padding-left:20px; width:800px; float:left; }
+.wpsg_admin_content h3 { margin-top:0px; margin-bottom:25px; }
+.wpsg_admin_submenu .list-group-item { padding:5px 10px; }
+.wpsg_admin nav.navbar { margin-right:20px; } 
+.wpsg_admin nav.navbar li { margin-bottom:0px; }
+.wpsg_admin .list-group-head { background-color:#666666; color:#FFFFFF; border:1px solid #666666; }
+.list-group { margin-bottom:15px !important; }
+
+/* Modulverwaltung */
+.wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; }
+.wpsg_admin_submenu .list-group-item.modul_akt .glyphicon { position:absolute; right:5px; top:5px; color:#3c763d; }
+.wpsg_admin_submenu .list-group-item.active { color:#dff0d8; }
+.wpsg_admin_submenu .list-group-item.active .glyphicon { position:absolute; right:5px; top:5px; color:#dff0d8; }
+.wpsg_modul_search_wrap { width:100%; position:relative; }
+.wpsg_modul_search { margin-bottom:15px; width:70%; }
+.wpsg_modul_onlyactive { position:absolute; }
+.wpsg_modul_onlyactive_glyphicon { position:absolute !important; right:5px; top:7px !important; color:#3c763d; }
+.wpsg_modul_search_wrap input[type="checkbox"] { right:25px; top:3px; position:absolute; }
+
+/* Formularanpassungen */
+.form-checkbox label { font-size:12px; line-height:200%; }
\ No newline at end of file
diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
index 17a613f..4bcf5c2 100644
--- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml
+++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
@@ -99,9 +99,9 @@
 				{
 						
 					$pdf->SetFont('Arial', 'B', ((intval($text['fontsize']) > 0)?intval($text['fontsize']):10));
-					$pdf->SetTextColor($text['color']);
-					$pdf->MultiCell($text['x'], $text['y'], 5, utf8_encode($text['text']));
-					$pdf->SetTextColor("#000000");
+					$pdf->wpsg_SetTextColor($text['color']);
+					$pdf->wpsg_MultiCell($text['x'], $text['y'], 5, $text['text']);
+					$pdf->wpsg_SetTextColor("#000000");
 						
 				}
 			
@@ -249,7 +249,7 @@
 		$height += 5 * ceil($produkt_text_width / $produkt_text_cell_width) + 3;
 		
 		$height_y = $pdf->getY();
-		$height = 2 + $pdf->MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, utf8_encode($produkt_text), 0, 'L', 0, $produkt_text_cell_width);
+		$height = 2 + $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, $produkt_text, 0, 'L', 0, $produkt_text_cell_width);
 		
 		$pdf->setXY($prod_left + 147, $prod_top + $offset);
 		$pdf->Cell(15, 8, $p['menge'], 0, 0, 'C');
@@ -271,7 +271,7 @@
 			$pdf->SetFont('Arial', 'I', 9);
 				
 			$cellY = $pdf->getY();
-			$pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, utf8_encode($produktBeschreibung), 0, 'L', 0, $produkt_text_cell_width);
+			$pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, $produktBeschreibung, 0, 'L', 0, $produkt_text_cell_width);
 			$pBeschreibungHeight = $pdf->getY() - $cellY - $height + 1;
 			$pdf->SetFont('Arial', '', 9);
 				
@@ -287,7 +287,7 @@
 				
 			$variInfo = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['productkey']));
 		
-			$height += $pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 1.5, 5, utf8_encode(wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key'])), 0, 'L', 0, $produkt_text_cell_width);
+			$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width);
 				 
 		}
 		
@@ -318,7 +318,7 @@
 	if ($this->view['fussText'] != "")
 	{
 	
-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($this->view['fussText']));
+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $this->view['fussText']);
 		$pdf->SetFont('Arial', 'B', 9);
 		$offset += 10;
 	
diff --git a/views/mods/mod_downloadplus/settings_edit.phtml b/views/mods/mod_downloadplus/settings_edit.phtml
index be972f0..ae0f31f 100644
--- a/views/mods/mod_downloadplus/settings_edit.phtml
+++ b/views/mods/mod_downloadplus/settings_edit.phtml
@@ -217,7 +217,7 @@
 			</p>
 			<p>
 				<?php echo __('HTTP Aufruf des Cron Scriptes:', 'wpsg'); ?><br /><br />
-				<a href="<?php echo WPSG_PLUGIN_URL; ?>/wpshopgermany/cron.php" target="_blank"><?php echo WPSG_PLUGIN_URL; ?>/wpshopgermany/cron.php</a>
+				<a href="<?php echo WPSG_PLUGIN_URL; ?>/<?php echo WPSG_FOLDERNAME; ?>/cron.php" target="_blank"><?php echo WPSG_PLUGIN_URL; ?>/wpshopgermany/cron.php</a>
 			</p>		
 			
 		</div>
diff --git a/views/mods/mod_fuellmenge/settings_edit.phtml b/views/mods/mod_fuellmenge/settings_edit.phtml
index 0c4af8d..3559e1b 100644
--- a/views/mods/mod_fuellmenge/settings_edit.phtml
+++ b/views/mods/mod_fuellmenge/settings_edit.phtml
@@ -8,6 +8,7 @@
 ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_einheit', __('Mögliche Einheiten (Kommagetrennt)', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_einheit'), array('help' => 'wpsg_mod_fuellmenge_einheit')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_bezug', __('Bezugsgröße', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_bezug'), array('help' => 'wpsg_mod_fuellmenge_bezug')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showAjaxDialog', __('In der Warenkorb-Lightbox anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog'), array('help' => 'wpsg_mod_fuellmenge_showAjaxDialog')); ?>
 <?php if ($this->hasMod('wpsg_mod_productindex')) { ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showProductindex_fmenge', __('Füllmenge auf Produktübersichtsseiten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showProductindex_fmenge'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_fmenge')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_fuellmenge_showProductindex_grundpreis', __('Grundpreis auf Produktübersichtsseiten anzeigen', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_showProductindex_grundpreis'), array('help' => 'wpsg_mod_fuellmenge_showProductindex_grundpreis')); ?>
diff --git a/views/mods/mod_gutschein/index.phtml b/views/mods/mod_gutschein/index.phtml
index 47659a3..f928462 100644
--- a/views/mods/mod_gutschein/index.phtml
+++ b/views/mods/mod_gutschein/index.phtml
@@ -220,7 +220,7 @@
 					<td class="column-status">
 						<?php if (trim($g['comment']) != '') { ?>
 						<a href="#" style="cursor:default;" title="<?php echo wpsg_hspc($g['comment']); ?>">
-							<img src="<?php echo WPSG_URL_CONTENT; ?>plugins/wpshopgermany/views/gfx/comment.png" alt="<?php echo wpsg_hspc($g['comment']); ?>" />
+							<img src="<?php echo WPSG_URL_CONTENT; ?>plugins/<?php echo WPSG_FOLDERNAME; ?>/views/gfx/comment.png" alt="<?php echo wpsg_hspc($g['comment']); ?>" />
 						</a>
 						<?php } ?>
 						<?php echo wpsg_hspc($g['status']); ?>
diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml
index d550f0f..bae8a63 100644
--- a/views/mods/mod_kundenverwaltung/edit.phtml
+++ b/views/mods/mod_kundenverwaltung/edit.phtml
@@ -93,7 +93,73 @@
 			
 		}
 		
-	} );
+// Visualisierung der Passwortstärke 
+
+	jQuery('input[type=password]').keyup(function(){
+
+			var password = jQuery(this).val();
+			
+			if (password.length < 6) {
+				
+				jQuery('#wpsg_pwd_length').removeClass('valid').addClass('invalid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_length').removeClass('invalid').addClass('valid');
+	
+			}
+
+			if (password.match(/([a-z])/)) {
+				
+				jQuery('#wpsg_pwd_letter').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_letter').removeClass('valid').addClass('invalid');
+	
+			}
+
+			if (password.match(/([A-Z])/)) {
+				
+				jQuery('#wpsg_pwd_capital').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_capital').removeClass('valid').addClass('invalid');
+	
+			}
+			
+			if (password.match(/([0-9])/)) {
+				
+				jQuery('#wpsg_pwd_number').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_number').removeClass('valid').addClass('invalid');
+	
+			}
+
+			if (password.match(/([~,!,%,@,&,#,°,^,$,?,_,*,§])/)) {
+				
+				jQuery('#wpsg_pwd_speziell').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_speziell').removeClass('valid').addClass('invalid');
+	
+			}
+			
+
+			jQuery('#wpsg_pwd_info').show(); 
+
+			jQuery(this).blur(function(){
+
+				jQuery('#wpsg_pwd_info').hide(); 
+				
+			});
+		});	
+	});		
+		
 
 /* ]]> */
 </script>
@@ -121,7 +187,19 @@
 						</h3>
 						<div class="inside">
 							<?php echo wpsg_drawForm_Input('password1', __('Passwort', 'wpsg'), ''); ?>
+							<span id="wpsg_customerpassword_result"></span>	
 							<?php echo wpsg_drawForm_Input('password2', __('Wiederholung', 'wpsg'), ''); ?>
+							<div id="wpsg_pwd_info"> 
+							<h4><?php echo __('Passwort sollte folgende Regeln befolgen:','wpsg') ?></h4>
+							<ul>
+									<li id="wpsg_pwd_length" class="invalid"><?php echo __('Das Passwort ist zu kurz!','wpsg')?></li>
+									<li id="wpsg_pwd_letter" class="invalid"><?php echo __('Mindestens ein Kleinbuchstabe','wpsg') ?></li>
+									<li id="wpsg_pwd_capital" class="invalid"><?php echo __('Mindestens ein Großbuchstabe','wpsg') ?></li>
+									<li id="wpsg_pwd_number" class="invalid"><?php echo __('Mindestens eine Zahl','wpsg') ?></li>
+									<li id="wpsg_pwd_speziell" class="invalid"><?php echo __('Mindestens ein Sonderzeichen','wpsg') ?></li>
+								</ul>
+							</div>
+							<div class="wpsg_clear"></div>	
 						</div>
 					</div>
 					
diff --git a/views/mods/mod_kundenverwaltung/profil.phtml b/views/mods/mod_kundenverwaltung/profil.phtml
index e95e157..7576e4d 100644
--- a/views/mods/mod_kundenverwaltung/profil.phtml
+++ b/views/mods/mod_kundenverwaltung/profil.phtml
@@ -9,10 +9,109 @@
 <script type="text/javascript">
 
 	jQuery(document).ready(function() {
+
+		<?php if ($this->get_option('wpsg_form_validation') == '1') { ?>
+
+		if (typeof jQuery.validationEngine == "object")
+		{
+
+			jQuery("#form-profil").validationEngine('attach', {promptPosition : "centerRight", scroll: false});
+
+		}
+
+		<?php } else if ($this->get_option('wpsg_form_validation') == '2') { ?>
+
+		jQuery.validator.addMethod("cRequired", jQuery.validator.methods.required, "<?php echo __('Dieses Feld ist ein Pflichtfeld.', 'wpsg'); ?>");
+		jQuery.validator.addClassRules('validate[required]', { cRequired: true } );
+		jQuery("#form-profil").validate( { 
+			ignore: '',
+			errorClass: 'wpsg_error',
+			onsubmit: false,
+			showErrors: function(errorMap, errorList) {
+
+				this.defaultShowErrors();	
+
+			}
+		} ); 
+
+		jQuery('#wpsg_mod_kundenverwaltung_save').bind('click', function() { 
+
+			var bReturn = jQuery('#form-profil').validate().form();
+			if (jQuery('#form-profil input.wpsg_error').length > 0) jQuery('#form-profil input.wpsg_error')[0].focus();
+			return bReturn;
+			  
+		} );
 		
-		jQuery("#form-profil").validationEngine('attach', {promptPosition : "centerRight", scroll: false});
+		<?php } ?>
 		
-	} );
+// Visualisierung der Passwortstärke 
+
+		jQuery('input[type=password]').keyup(function(){
+
+			var password = jQuery(this).val();
+			
+			if (password.length < 6) {
+				
+				jQuery('#wpsg_pwd_length').removeClass('valid').addClass('invalid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_length').removeClass('invalid').addClass('valid');
+	
+			}
+
+			if (password.match(/([a-z])/)) {
+				
+				jQuery('#wpsg_pwd_letter').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_letter').removeClass('valid').addClass('invalid');
+	
+			}
+
+			if (password.match(/([A-Z])/)) {
+				
+				jQuery('#wpsg_pwd_capital').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_capital').removeClass('valid').addClass('invalid');
+	
+			}
+			
+			if (password.match(/([0-9])/)) {
+				
+				jQuery('#wpsg_pwd_number').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_number').removeClass('valid').addClass('invalid');
+	
+			}
+
+			if (password.match(/([~,!,%,@,&,#,°,^,$,?,_,*,§])/)) {
+				
+				jQuery('#wpsg_pwd_speziell').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_speziell').removeClass('valid').addClass('invalid');
+	
+			}
+			
+
+			jQuery('#wpsg_pwd_info').show(); 		
+			
+			jQuery(this).blur(function(){
+
+				jQuery('#wpsg_pwd_info').hide(); 
+				
+			});
+			
+		});	
+
+	});	
 		
 </script>
 
@@ -141,21 +240,21 @@
 		<div class="wpsg_checkoutblock">
 			<label class="wpsg_cv" for="wpsg_cv_<?php echo $c_id; ?>">
 				<?php echo wpsg_hspc(__($c['name'], 'wpsg')); ?><?php if ($c['show'] == '0') { ?> <span class="wpsg_required">*</span><?php } ?>:
-				<?php if ($c['typ'] == '0') { // Textfeld ?>
-				<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[profil][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc($this->view['data']['custom'][$c_id]); ?>" />
-				<?php } else if ($c['typ'] == '1') { $arAuswahl = explode("|", $c['auswahl']); // Auswahlfeld ?>
-				<select class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[profil][custom][<?php echo $c_id; ?>]">
-					<option value="-1"><?php echo __('Bitte Auswählen', 'wpsg'); ?></option>
-					<?php foreach ((array)$arAuswahl as $a) { ?>
-					<option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == $this->view['data']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
-					<?php } ?>
-				</select>
-				<?php } else if ($c['typ'] == '2') { // Checkbox ?>
-				<input type="hidden" name="wpsg[profil][custom][<?php echo $c_id; ?>]" value="0" />
-				<input id="wpsg_cv_<?php echo $c_id; ?>" class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[profil][custom][<?php echo $c_id; ?>]" value="1" <?php echo wpsg_hspc(($this->view['data']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
-				<span class="wpsg_clear"></span> 
-				<?php } ?>
 			</label>
+			<?php if ($c['typ'] == '0') { // Textfeld ?>
+			<input class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[profil][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc($this->view['data']['custom'][$c_id]); ?>" />
+			<?php } else if ($c['typ'] == '1') { $arAuswahl = explode("|", $c['auswahl']); // Auswahlfeld ?>
+			<select class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[profil][custom][<?php echo $c_id; ?>]">
+				<option value="-1"><?php echo __('Bitte Auswählen', 'wpsg'); ?></option>
+				<?php foreach ((array)$arAuswahl as $a) { ?>
+				<option value="<?php echo wpsg_hspc($a); ?>" <?php echo (($a == $this->view['data']['custom'][$c_id])?'selected="selected"':''); ?>><?php echo wpsg_hspc($a); ?></option>
+				<?php } ?>
+			</select>
+			<?php } else if ($c['typ'] == '2') { // Checkbox ?>
+			<input type="hidden" name="wpsg[profil][custom][<?php echo $c_id; ?>]" value="0" />
+			<input id="wpsg_cv_<?php echo $c_id; ?>" class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[profil][custom][<?php echo $c_id; ?>]" value="1" <?php echo wpsg_hspc(($this->view['data']['custom'][$c_id] == '1')?'checked="checked"':''); ?> />
+			<span class="wpsg_clear"></span> 
+			<?php } ?>			
 		</div>
 		<?php } } ?>
 		<?php } ?>
@@ -166,7 +265,7 @@
 			<label for="wpsg_mod_kundenverwaltung_pwd1"><?php echo __("Passwort", "wpsg"); ?>
 			<?php if ($this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegisterzwand') == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="wpsg_checkout <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="mod_kundenverwaltung_pwd1" name="wpsg[mod_kundenverwaltung][register_pwd1]" value="" />	
+			<input class="wpsg_checkout <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="wpsg_mod_kundenverwaltung_pw1" name="wpsg[mod_kundenverwaltung][register_pwd1]" value="" /><span id="wpsg_mod_kundenverwaltung_password_result"></span>	
 		</div>
 		
 		<div class="wpsg_checkoutblock">		
@@ -176,6 +275,17 @@
 			<input class="wpsg_checkout <?php echo ((in_array("mod_kundenverwaltung_pwd2", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="wpsg_mod_kundenverwaltung_pwd2" name="wpsg[mod_kundenverwaltung][register_pwd2]" value="" />
 		</div>
 		
+		<div id="wpsg_pwd_info"> 
+		<h4><?php echo __('Passwort sollte folgende Regeln befolgen:','wpsg') ?></h4>
+			<ul>
+				<li id="wpsg_pwd_length" class="invalid"><?php echo __('Das Passwort ist zu kurz!','wpsg')?></li>
+				<li id="wpsg_pwd_letter" class="invalid"><?php echo __('Mit mindestens einem Kleinbuchstaben wird das Passwort noch sicherer','wpsg') ?></li>
+				<li id="wpsg_pwd_capital" class="invalid"><?php echo __('Mit mindestens einem Großbuchstaben wird das Passwort noch sicherer','wpsg') ?></li>
+				<li id="wpsg_pwd_number" class="invalid"><?php echo __('Mit mindestens einer Zahl wird das Passwort noch sicherer','wpsg') ?></li>
+				<li id="wpsg_pwd_speziell" class="invalid"><?php echo __('Mit mindestens einem Sonderzeichen wird das Passwort noch sicherer','wpsg') ?></li>
+			</ul>
+		</div>
+		
 		<div class="wpsg_clear"></div><br />
 	
 		<div class="wpsg_mandatoryfield_hint">
@@ -184,7 +294,7 @@
 		
 		<div class="wpsg_clear"></div><br />
 		
-		<input type="submit" class="wpsg_button wpsg_saveButton" value="<?php echo __('Speichern', 'wpsg'); ?>" name="wpsg_mod_kundenverwaltung_save" />
+		<input type="submit" class="wpsg_button wpsg_saveButton" id="wpsg_mod_kundenverwaltung_save" value="<?php echo __('Speichern', 'wpsg'); ?>" name="wpsg_mod_kundenverwaltung_save" />
 	
 		<?php $this->ClearSessionErrors(); ?>
 	
diff --git a/views/mods/mod_kundenverwaltung/register.phtml b/views/mods/mod_kundenverwaltung/register.phtml
index 01c06ab..55384df 100644
--- a/views/mods/mod_kundenverwaltung/register.phtml
+++ b/views/mods/mod_kundenverwaltung/register.phtml
@@ -48,15 +48,87 @@
 		
 		<?php } ?>
 		
-	} );
+
+// Visualisierung der Passwortstärke 
+
+		jQuery('input[type=password]').keyup(function(){
+
+			var password = jQuery(this).val();
+			
+			if (password.length < 6) {
+				
+				jQuery('#wpsg_pwd_length').removeClass('valid').addClass('invalid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_length').removeClass('invalid').addClass('valid');
+	
+			}
+
+			if (password.match(/([a-z])/)) {
+				
+				jQuery('#wpsg_pwd_letter').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_letter').removeClass('valid').addClass('invalid');
+	
+			}
+
+			if (password.match(/([A-Z])/)) {
+				
+				jQuery('#wpsg_pwd_capital').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_capital').removeClass('valid').addClass('invalid');
+	
+			}
+			
+			if (password.match(/([0-9])/)) {
+				
+				jQuery('#wpsg_pwd_number').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_number').removeClass('valid').addClass('invalid');
+	
+			}
+
+			if (password.match(/([~,!,%,@,&,#,°,^,$,?,_,*,§])/)) {
+				
+				jQuery('#wpsg_pwd_speziell').removeClass('invalid').addClass('valid');
+
+			}else{
+
+				jQuery('#wpsg_pwd_speziell').removeClass('valid').addClass('invalid');
+	
+			}
+			
+
+			jQuery('#wpsg_pwd_info').show(); 
+
+
+			jQuery(this).blur(function(){
+
+				jQuery('#wpsg_pwd_info').hide(); 
+				
+			});
+			
+		});
+
 		
+// Validierung Spam	
+
 	<?php
-   		if ($_GET["wpsg_spam_email"] != "") {
-     		echo "<p>Sie haben ein Feld ausgefüllt, das frei bleiben muss.</p>";
-     		exit;
-  		}
+	   		if ($_GET["wpsg_spam_email"] != "") {
+	     		echo "<p>Sie haben ein Feld ausgefüllt, das frei bleiben muss.</p>";
+	     		exit;
+	  		}
 	?>
-		
+
+	});	
+	
 </script>
 
 <div class="wpsg wpsg_checkout wpsg_register">
@@ -115,7 +187,7 @@
 			<label for="pwd1" class="wpsg_register"><?php echo __("Passwort", "wpsg"); ?>
 			<?php if ($this->view['pflicht']['pwd1'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 			</label>
-			<input class="<?php echo (($this->view['pflicht']['pwd1'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="pwd1" name="wpsg[register][register_pwd1]" value="" />
+			<input class="<?php echo (($this->view['pflicht']['pwd1'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("mod_kundenverwaltung_pwd1", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="pwd1" name="wpsg[register][register_pwd1]" value="" /><span id="wpsg_checkoutblock_password_result"></span>
 		</div>
 		
 		<div class="wpsg_checkoutblock">
@@ -125,6 +197,17 @@
 			<input class="<?php echo (($this->view['pflicht']['pwd2'] != '1')?'validate[required]':''); ?> wpsg_register <?php echo ((in_array("mod_kundenverwaltung_pwd2", (array)$this->view['error']))?'wpsg_error':''); ?>" type="password" id="pwd2" name="wpsg[register][register_pwd2]" value="" />
 		</div>
 		
+		<div id="wpsg_pwd_info"> 
+			<h4><?php echo __('Passwort sollte folgende Regeln befolgen:','wpsg') ?></h4>
+			<ul>
+				<li id="wpsg_pwd_length" class="invalid"><?php echo __('Das Passwort ist zu kurz!','wpsg')?></li>
+				<li id="wpsg_pwd_letter" class="invalid"><?php echo __('Mit mindestens einem Kleinbuchstaben wird das Passwort noch sicherer','wpsg') ?></li>
+				<li id="wpsg_pwd_capital" class="invalid"><?php echo __('Mit mindestens einem Großbuchstaben wird das Passwort noch sicherer','wpsg') ?></li>
+				<li id="wpsg_pwd_number" class="invalid"><?php echo __('Mit mindestens einer Zahl wird das Passwort noch sicherer','wpsg') ?></li>
+				<li id="wpsg_pwd_speziell" class="invalid"><?php echo __('Mit mindestens einem Sonderzeichen wird das Passwort noch sicherer','wpsg') ?></li>
+			</ul>
+		</div>
+		
 		<div class="wpsg_checkoutblock">
 			<label for="geb" class="wpsg_register"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)', 'wpsg'); ?>
 			<?php if ($this->view['pflicht']['geb'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
diff --git a/views/mods/mod_kundenverwaltung/settings_edit.phtml b/views/mods/mod_kundenverwaltung/settings_edit.phtml
index aa472e2..68c82ff 100644
--- a/views/mods/mod_kundenverwaltung/settings_edit.phtml
+++ b/views/mods/mod_kundenverwaltung/settings_edit.phtml
@@ -31,10 +31,10 @@
 </div>
 
 <br />
-<?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_profil', __('Profilseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_profil')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_registrierung', __('Registrierungsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_registrierung')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung', __('Weiterleitung nach Registrierung', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_order', __('Bestellübersichtsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_order')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_profil', __('Profilseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_profil'), array('help' => 'wpsg_page_mod_kundenverwaltung_profil')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_registrierung', __('Registrierungsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_registrierung'), array('help' => 'wpsg_page_mod_kundenverwaltung_registrierung')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung', __('Weiterleitung nach Registrierung', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung'), array('help' => 'wpsg_page_mod_kundenverwaltung_weiterleitung_nach_registrierung')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_order', __('Bestellübersichtsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_kundenverwaltung_order'), array('help' => 'wpsg_mod_kundenverwaltung_order')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_onlylogin', __('Bestellungen nur für registrierte Kunden zulassen', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_onlylogin'), array('help' => 'wpsg_mod_kundenverwaltung_onlylogin')); ?>
 <br />
 
diff --git a/views/mods/mod_legaltexts/settings_edit.phtml b/views/mods/mod_legaltexts/settings_edit.phtml
index 96b3b93..25cf8a6 100644
--- a/views/mods/mod_legaltexts/settings_edit.phtml
+++ b/views/mods/mod_legaltexts/settings_edit.phtml
@@ -10,7 +10,7 @@
 	wpsg_mod_legaltexts::PROVIDER_PROTECTEDSHOPS => __('Protected Shops', 'wpsg'),
 	wpsg_mod_legaltexts::PROVIDER_HAENDLERBUND => __('Händlerbund', 'wpsg'),
 	wpsg_mod_legaltexts::PROVIDER_ITRECHT => __('IT-Recht Kanzlei München', 'wpsg')
-), $this->get_option('wpsg_mod_legaltexts_provider')); ?>
+), $this->get_option('wpsg_mod_legaltexts_provider'), array('help' => 'wpsg_mod_legaltexts_provider')); ?>
 
 <br />
 
diff --git a/views/mods/mod_micropayment/settings_edit.phtml b/views/mods/mod_micropayment/settings_edit.phtml
index c06c99d..8d9887b 100644
--- a/views/mods/mod_micropayment/settings_edit.phtml
+++ b/views/mods/mod_micropayment/settings_edit.phtml
@@ -5,10 +5,10 @@
 	 */
 
 ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_accountid', __('Account ID', 'wpsg'), $this->get_option('wpsg_mod_micropayment_accountid')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_accountid', __('Account ID', 'wpsg'), $this->get_option('wpsg_mod_micropayment_accountid'), array('help' => 'wpsg_mod_micropayment_accountid')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_projectid', __('Projekt ID', 'wpsg'), $this->get_option('wpsg_mod_micropayment_projectid'), array('help' => 'wpsg_mod_micropayment_projectid')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_accesskey', __('AccessKey', 'wpsg'), $this->get_option('wpsg_mod_micropayment_accesskey'), array('help' => 'wpsg_mod_micropayment_accesskey')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_successPage', __('Seite nach erfolgreicher Zahlung', 'wpsg'), $this->view['wpsg_mod_micropayment']['arPages'], $this->get_option('wpsg_mod_micropayment_successPage')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_successPage', __('Seite nach erfolgreicher Zahlung', 'wpsg'), $this->view['wpsg_mod_micropayment']['arPages'], $this->get_option('wpsg_mod_micropayment_successPage'), array('help' => 'wpsg_mod_micropayment_successpage')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_paystart', __('Zahlungs sofort starten', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paystart')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_apiURL', __('API URL', 'wpsg'), $this->view['wpsg_mod_micropayment']['apiURL'], array('readonly' => true, 'hint' => __('Muss im micropayment™ Interface hinterlegt werden.', 'wpsg'), 'help' => 'wpsg_mod_micropayment_apiURL')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_sandbox', __('Sandbox', 'wpsg'), $this->get_option('wpsg_mod_micropayment_sandbox')); ?>
@@ -17,7 +17,7 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_layout', __('Layout', 'wpsg'), $this->get_option('wpsg_mod_micropayment_layout'), array('help' => 'wpsg_mod_micropayment_layout')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_bgcolor', __('Hintergrundfarbe', 'wpsg'), $this->get_option('wpsg_mod_micropayment_bgcolor'), array('help' => 'wpsg_mod_micropayment_bgcolor')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_campaign', __('Kampagne des Projektinhabers', 'wpsg'), $this->get_option('wpsg_mod_micropayment_campaign'), array('help' => 'wpsg_mod_micropayment_campaign')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_bggfx', __('Hintergrundgrafik für Zahlfenster', 'wpsg'), $this->get_option('wpsg_mod_micropayment_bggfx')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_bggfx', __('Hintergrundgrafik für Zahlfenster', 'wpsg'), $this->get_option('wpsg_mod_micropayment_bggfx'), array ('help' => 'wpsg_mod_micropayment_bggfx')); ?>
 <br />
 <div class="wpsg_admin_box" id="wpsg_mod_micropayment_creditcard">
 	<div id="mail_global" class="head" style="border-bottom: 0px none;">
@@ -28,12 +28,12 @@
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_creditcard_activ', __('Zahlungsart "Kreditkarte" aktiv', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_activ'), array(
 				/* 'hint' => wpsg_translate(__('Für Abrechnungsbeträge zwischen #1# und #2#', 'wpsg'), wpsg_ff(2.50, $this->get_option('wpsg_currency')), wpsg_ff(500, $this->get_option('wpsg_currency'))) */
 			)); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcard_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_name')); ?>
-			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_creditcard_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_hint')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcard_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_logo')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcard_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_creditcard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_creditcard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_creditcard_mwst')); ?>
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_creditcard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_mwstland')); ?>			
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcard_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_name'), array('help' => 'wpsg_mod_micropayment_name')); ?>
+			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_creditcard_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_hint'), array('help' => 'wpsg_mod_micropayment_hint')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcard_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_logo'), array('help' => 'wpsg_mod_micropayment_logo')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcard_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_creditcard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_name')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_creditcard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_creditcard_mwst'), array('help' => 'wpsg_mod_micropayment_mwst')); ?>
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_creditcard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcard_mwstland'), array('help' => 'wpsg_mod_micropayment_mwstland')); ?>			
 		</div>
 	</div>
 </div>
@@ -47,12 +47,12 @@
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_creditcardreservation_activ', __('Zahlungsart "Kreditkarte mit Reservierung" aktiv', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_activ'), array(
 				/* 'hint' => wpsg_translate(__('Für Abrechnungsbeträge zwischen #1# und #2#', 'wpsg'), wpsg_ff(2.50, $this->get_option('wpsg_currency')), wpsg_ff(500, $this->get_option('wpsg_currency'))) */
 			)); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcardreservation_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_name')); ?>
-			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_creditcardreservation_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_hint')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcardreservation_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_logo')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcardreservation_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_creditcardreservation_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_creditcardreservation_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_creditcardreservation_mwst')); ?>			
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_creditcardreservation_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_mwstland')); ?>			
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcardreservation_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_name'), array('help' => 'wpsg_mod_micropayment_name')); ?>
+			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_creditcardreservation_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_hint'), array('help' => 'wpsg_mod_micropayment_hint')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcardreservation_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_logo'), array('help' => 'wpsg_mod_micropayment_logo')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_creditcardreservation_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_creditcardreservation_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_gebuehr')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_creditcardreservation_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_creditcardreservation_mwst'), array('help' => 'wpsg_mod_micropayment_mwst')); ?>			
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_creditcardreservation_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_creditcardreservation_mwstland'), array('help' => 'wpsg_mod_micropayment_cmwstland')); ?>			
 		</div>
 	</div>
 </div>
@@ -63,14 +63,14 @@
 			<div class="fulltab"><?php echo __('Lastschrift - Abrechnung per Lastschrift', 'wpsg'); ?></div>
 		</div>
 		<div class="content wpsg_admin_box_content" style="display: block;">
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_directdebit_activ', __('Zahlungsart "Lastschrift" aktiv', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_activ')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_directdebit_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_name')); ?>
-			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_directdebit_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_hint')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_directdebit_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_logo')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_directdebit_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_directdebit_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_directdebit_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_directdebit_mwst')); ?>			
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_directdebit_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_mwstland')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_directdebit_subject', __('Betreff der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_subject')); ?>			
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_directdebit_activ', __('Zahlungsart "Lastschrift" aktiv', 'wpsg'), $this->get_option('wpsg_mod_micropayment_activ')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_directdebit_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_name'), array('help' => 'wpsg_mod_micropayment_name')); ?>
+			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_directdebit_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_hint'), array('help' => 'wpsg_mod_micropayment_hint')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_directdebit_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_logo'), array('help' => 'wpsg_mod_micropayment_logo')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_directdebit_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_directdebit_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_gebuehr')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_directdebit_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_directdebit_mwst'), array('help' => 'wpsg_mod_micropayment_mwst')); ?>	
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_directdebit_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_mwstland'), array('help' => 'wpsg_mod_micropayment_mwstland')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_directdebit_subject', __('Betreff der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_directdebit_subject'), array('help' => 'wpsg_mod_micropayment_subject')); ?>		
 		</div>
 	</div>
 </div>
@@ -84,12 +84,12 @@
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_ebank2pay_activ', __('Zahlungsart "eBank2Pay" aktiv', 'wpsg'), $this->get_option('wpsg_mod_micropayment_ebank2pay_activ'), array(
 				/* 'hint' => wpsg_translate(__('Für Abrechnungsbeträge zwischen #1# und #2#', 'wpsg'), wpsg_ff(0.50, $this->get_option('wpsg_currency')), wpsg_ff(500, $this->get_option('wpsg_currency'))) */ 
 			)); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_ebank2pay_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_ebank2pay_name')); ?>
-			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_ebank2pay_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_ebank2pay_hint')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_ebank2pay_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_ebank2pay_logo')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_ebank2pay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_ebank2pay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_ebank2pay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_ebank2pay_mwst')); ?>
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_ebank2pay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_ebank2pay_mwstland')); ?>						
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_ebank2pay_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_ebank2pay_name'), array('help' => 'wpsg_mod_micropayment_name')); ?>
+			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_ebank2pay_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_ebank2pay_hint'), array('help' => 'wpsg_mod_micropayment_hint')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_ebank2pay_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_ebank2pay_logo'), array('help' => 'wpsg_mod_micropayment_logo')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_ebank2pay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_ebank2pay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_gebuehr')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_ebank2pay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_ebank2pay_mwst'), array('help' => 'wpsg_mod_micropayment_mwst')); ?>
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_ebank2pay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_ebank2pay_mwstland'), array('help' => 'wpsg_mod_micropayment_mwstland')); ?>						
 		</div>
 	</div>
 </div>
@@ -101,13 +101,13 @@
 		</div>
 		<div class="content wpsg_admin_box_content" style="display: block;">
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_prepayment_activ', __('Zahlungsart "Vorkasse" aktiv', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_activ')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_prepayment_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_name')); ?>
-			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_prepayment_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_hint')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_prepayment_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_logo')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_prepayment_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_prepayment_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_prepayment_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_prepayment_mwst')); ?>
-			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_prepayment_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_mwstland')); ?>
-			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_prepayment_subject', __('Betreff der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_subject')); ?>			
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_prepayment_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_name'), array('help' => 'wpsg_mod_micropayment_name')); ?>
+			<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_prepayment_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_hint'), array('help' => 'wpsg_mod_micropayment_hint')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_prepayment_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_logo'), array('help' => 'wpsg_mod_micropayment_logo')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_prepayment_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_prepayment_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_gebuehr')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_prepayment_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_prepayment_mwst'), array('help' => 'wpsg_mod_micropayment_mwst')); ?>
+			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_prepayment_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_mwstland'), array('help' => 'wpsg_mod_micropayment_mwstland')); ?>
+			<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_prepayment_subject', __('Betreff der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_prepayment_subject'), array('help' => 'wpsg_mod_micropayment_subject')); ?>			
 		</div>
 	</div>
 </div>
@@ -123,12 +123,12 @@
 				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_call2pay_activ', __('Zahlungsart "Call2Pay" aktiv', 'wpsg'), $this->get_option('wpsg_mod_micropayment_call2pay_activ'), array(
 					/* 'hint' => wpsg_translate(__('Für Abrechnungsbeträge zwischen #1# und #2#', 'wpsg'), wpsg_ff(0.05, $this->get_option('wpsg_currency')), wpsg_ff(50, $this->get_option('wpsg_currency'))) */
 				)); ?>
-				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_call2pay_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_call2pay_name')); ?>
-				<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_call2pay_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_call2pay_hint')); ?>
-				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_call2pay_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_call2pay_logo')); ?>
-				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_call2pay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_call2pay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %')); ?>
-				<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_call2pay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_call2pay_mwst')); ?>
-				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_call2pay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_call2pay_mwstland')); ?>
+				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_call2pay_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_call2pay_name'), array('help' => 'wpsg_mod_micropayment_name')); ?>
+				<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_call2pay_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_call2pay_hint'), array('help' => 'wpsg_mod_micropayment_hint')); ?>
+				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_call2pay_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_call2pay_logo'), array('help' => 'wpsg_mod_micropayment_logo')); ?>
+				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_call2pay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_call2pay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_gebuehr')); ?>
+				<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_call2pay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_call2pay_mwst'), array('help' => 'wpsg_mod_micropayment_mwst')); ?>
+				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_call2pay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_call2pay_mwstland'), array('help' => 'wpsg_mod_micropayment_mwstland')); ?>
 			</div>
 			
 			<?php if ($this->get_option('wpsg_mod_micropayment_call2pay_activ') != '1') { ?>
@@ -169,12 +169,12 @@
 				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_handypay_activ', __('Zahlungsart "Call2Pay" aktiv', 'wpsg'), $this->get_option('wpsg_mod_micropayment_handypay_activ'), array(
 					/* 'hint' => wpsg_translate(__('Für Abrechnungsbeträge zwischen #1# und #2#', 'wpsg'), wpsg_ff(0.50, $this->get_option('wpsg_currency')), wpsg_ff(5.00, $this->get_option('wpsg_currency'))) */
 				)); ?>
-				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_handypay_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_handypay_name')); ?>
-				<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_handypay_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_handypay_hint')); ?>
-				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_handypay_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_handypay_logo')); ?>
-				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_handypay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_handypay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %')); ?>
-				<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_handypay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_handypay_mwst')); ?>
-				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_handypay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_handypay_mwstland')); ?>						
+				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_handypay_name', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_micropayment_handypay_name'), array('help' => 'wpsg_mod_micropayment_name')); ?>
+				<?php echo wpsg_drawForm_Textarea('wpsg_mod_micropayment_handypay_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_micropayment_handypay_hint'), array('help' => 'wpsg_mod_micropayment_hint')); ?>
+				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_handypay_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_handypay_logo'), array('help' => 'wpsg_mod_micropayment_logo')); ?>
+				<?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_handypay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_handypay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_gebuehr')); ?>
+				<?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_handypay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_handypay_mwst'), array('help' => 'wpsg_mod_micropayment_mwst')); ?>
+				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_handypay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_handypay_mwstland'), array('help' => 'wpsg_mod_micropayment_mwstland')); ?>						
 			</div>
 		
 			<?php if ($this->get_option('wpsg_mod_micropayment_handypay_activ') != '1') { ?>
diff --git a/views/mods/mod_newsletter/settings_edit.phtml b/views/mods/mod_newsletter/settings_edit.phtml
index 85cba37..68d55c5 100644
--- a/views/mods/mod_newsletter/settings_edit.phtml
+++ b/views/mods/mod_newsletter/settings_edit.phtml
@@ -22,12 +22,13 @@
 				<option value="<?php echo $group_id; ?>"><?php echo $group; ?></option>
 				<?php } ?>
 			</select>
+			<a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_newsletter_imoprtgroups" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_newsletter_imoprtgroups"></a>						
 			<input type="button" onclick="return wpsg_doImport();" value="<?php echo __('Kunden importieren', 'wpsg'); ?>" class="button" style="width:auto;" />
 		</div>
 		<div class="wpsg_clear"></div>
 	</div>
 	
-	<script type="text/javascript">/* <![CDATA[ */
+	<script type="text/javascript">/* <![CDATA[ */
 
 	   	/**
 	   	 * Startet den Import
@@ -57,7 +58,7 @@
 			location.href = '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_newsletter&do=import&noheader=1&groups=' + strGroups;
  			
 		} // function wpsg_doImport()			
-	
+	
 	/* ]]> */</script>
 		
 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_onepagecheckout/onepage.phtml b/views/mods/mod_onepagecheckout/onepage.phtml
index 2fe1e26..8f0b130 100644
--- a/views/mods/mod_onepagecheckout/onepage.phtml
+++ b/views/mods/mod_onepagecheckout/onepage.phtml
@@ -9,6 +9,8 @@
 
 	<?php echo $this->writeFrontendMessage(); ?>
 	 
+	<?php $GLOBALS['step'] = 2; $this->render(WPSG_PATH_VIEW.'/warenkorb/progress.phtml'); ?>
+	 
 	<form id="wpsg_basket_form" name="wpsg_basket_form"  method="post" action="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>" enctype="multipart/form-data">
 				    
 		<div class="wpsg_clear"></div>
@@ -185,7 +187,7 @@
 					<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl", "wpsg"); ?> 
 					<?php if ($this->view['pflicht']['plz'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 					</label>
-					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="number" id="plz" name="wpsg[checkout][plz]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['plz']); ?>" />
+					<input class="wpsg_input_text <?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[checkout][plz]" value="<?php echo htmlspecialchars($this->view['basket']['checkout']['plz']); ?>" />
 				</div>
 				
 				<div class="wpsg_checkoutblock">
@@ -398,5 +400,5 @@
 		} );
 			
 	/* ]]> */</script>
-	 	
+	
 </div>
\ No newline at end of file
diff --git a/views/mods/mod_orderupload/checkout_inner_prebutton.phtml b/views/mods/mod_orderupload/checkout_inner_prebutton.phtml
index 1c347b6..c0f1a06 100644
--- a/views/mods/mod_orderupload/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_orderupload/checkout_inner_prebutton.phtml
@@ -10,11 +10,11 @@
 	<div class="wpsg_inner">
 			
 		<input type="file" name="wpsg_mod_orderupload_file" />
-	
-		<?php if (wpsg_isSizedArray($_SESSION['wpsg']['checkout']['wpsg_mod_orderupload'])) { ?>
+ 
+		<?php if (wpsg_isSizedArray($_SESSION['wpsg']['wpsg_mod_orderupload'])) { ?>
 			<br />
 			<label class="wpsg_checkout"><?php echo __('Bisher hochgeladene Dokumente', 'wpsg'); ?>:</label><br />
-			<?php foreach ($_SESSION['wpsg']['checkout']['wpsg_mod_orderupload'] as $ou_index => $ou) { ?>
+			<?php foreach ($_SESSION['wpsg']['wpsg_mod_orderupload'] as $ou_index => $ou) { ?>
 			<a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Dokument aus der Bestellung entfernen möchten?', 'wpsg'); ?>');" href="?wpsg_plugin=wpsg_mod_orderupload&wpsg_action=remove&file_index=<?php echo $ou_index; ?>" class="wpsg_mod_orderupload_removelink">
 				<?php echo __('Entfernen', 'wpsg'); ?>
 			</a>
diff --git a/views/mods/mod_ordervars/ov_list.phtml b/views/mods/mod_ordervars/ov_list.phtml
index 4eaf955..126c91a 100644
--- a/views/mods/mod_ordervars/ov_list.phtml
+++ b/views/mods/mod_ordervars/ov_list.phtml
@@ -8,14 +8,14 @@
 <?php if (is_array($this->view['data']) && sizeof($this->view['data']) > 0) { ?>
 <table class="wpsg_ov_table">
 	 <tr>
-	 	<th class="wpsg_id"><?php echo __('ID', 'wpsg'); ?></th>
+	 	<th><?php echo __('ID', 'wpsg'); ?></th>
     	<th class="wpsg_label"><?php echo __('Name', 'wpsg'); ?></th>
     	<th class="wpsg_typ"><?php echo __('Typ', 'wpsg'); ?></th>
     	<th class="wpsg_pflicht"><?php echo __('Pflicht', 'wpsg'); ?></th>
     	<th class="wpsg_delcol"></th>
   	</tr>
   	<?php $i = 0; foreach ($this->view['data'] as $ov) { $i ++; ?>
-	<tr class="wpsg_table wpsg_tablerow <?php echo (($i % 2 == 0)?'odd':'even'); ?>">
+	<tr class="wpsg_table wpsg_tablerow <?php echo (($i % 2 == 0)?'odd':'even'); ?>" id="ov_<?php echo $ov['id']; ?>">
 		<td class="wpsg_id"><?php echo $ov['id']; ?></td>
 		<td id="wpsg_ov_name_<?php echo $ov['id']; ?>" class="wpsg_label wpsg_editable"><?php echo wpsg_hspc(__($ov['name'], 'wpsg')); ?></td>
 		<td id="wpsg_ov_typ_<?php echo $ov['id']; ?>" class="wpsg_typ wpsg_editable"><?php echo $this->mod->arTypen[$ov['typ']]; ?></td>
@@ -116,6 +116,39 @@
 	</tr>
 	<?php } ?>
 </table>
+<p class="wpsg_hinweis"><?php echo __('Die Reihenfolge lässt sich mittels Drag&Drop verändern.', 'wpsg'); ?>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+
+		jQuery('.wpsg_ov_table').sortable( {
+			helper: wpsg_Tablefix,
+			items: 'tr.wpsg_tablerow',
+			handler: '.wpsg_id',
+			update: function(event, ui) {
+
+				var wpsg_reorder = jQuery(this).sortable('serialize');
+
+				jQuery.ajax( {
+					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordervars&noheader=1&do=reorder',
+					data: { 
+						wpsg_reorder: wpsg_reorder
+					},
+					success: function(data) {
+
+						if (data !== "1") alert(data);
+						
+					}
+				} );
+				
+			}
+		} );
+		
+	} );
+			
+/* ]]> */</script>
+
 <?php } else { ?>
 <?php echo __('Bisher noch keine Bestellvariablen angelegt.', 'wpsg'); ?>
 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_paypal/settings_edit.phtml b/views/mods/mod_paypal/settings_edit.phtml
index 681959e..9fa89d4 100644
--- a/views/mods/mod_paypal/settings_edit.phtml
+++ b/views/mods/mod_paypal/settings_edit.phtml
@@ -88,8 +88,8 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_paypal_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
 
 <br />
-<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_currency', __('Währungscode (Standard: EUR)', 'wpsg'), $this->get_option('wpsg_mod_paypal_currency')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_paypal_language', __('Sprache im PayPal Interface', 'wpsg'), array('DE' => __('Deutsch', 'wpsg'), 'US' => __('Englisch', 'wpsg'), 'FR' => __('Französisch', 'wpsg')), $this->get_option('wpsg_mod_paypal_language')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_currency', __('Währungscode (Standard: EUR)', 'wpsg'), $this->get_option('wpsg_mod_paypal_currency'), array('help' => 'wpsg_mod_paypal_currency')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_paypal_language', __('Sprache im PayPal Interface', 'wpsg'), array('DE' => __('Deutsch', 'wpsg'), 'US' => __('Englisch', 'wpsg'), 'FR' => __('Französisch', 'wpsg')), $this->get_option('wpsg_mod_paypal_language'), array('help' => 'wpsg_mod_paypal_language')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_autostart', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_paypal_autostart'), array('help' => 'wpsg_shippay_paystart')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_page_mod_paypal_success', __('Erfolgsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_paypal_success'), array('help' => 'wpsg_page_mod_paypal_success')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_page_mod_paypal_error', __('Fehlerseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_paypal_error'), array('help' => 'wpsg_page_mod_paypal_error')); ?>
diff --git a/views/mods/mod_paypalapi/checkout_handlePayment.phtml b/views/mods/mod_paypalapi/checkout_handlePayment.phtml
index adb02e3..4a87103 100644
--- a/views/mods/mod_paypalapi/checkout_handlePayment.phtml
+++ b/views/mods/mod_paypalapi/checkout_handlePayment.phtml
@@ -41,14 +41,29 @@
 		<div id="wpsg_ppplus"></div>
 		
 		<?php if (wpsg_isSizedString($this->view['wpsg_mod_paypalapi']['error'])) { ?>
-		<div id="wpsg_error" class="published error">
+		<div id="wpsg_notice" class="published error">
 			<p><?php echo $this->view['wpsg_mod_paypalapi']['error']; ?>
 		</div>		
 		<?php } ?>
 	    
 	</div>
-	           
+	         
+	<iframe name="wpsg_hiddenTarget" style="display:none; width:0px; height:0px;"></iframe>  
 	<script type="application/javascript">/* <![CDATA[ */
+
+		function wpsg_ppp_handleError()
+		{
+			
+			location.href = '<?php echo $this->getUrl(wpsg_ShopController::URL_CHECKOUT); ?>';
+			
+		}
+
+		function wpsg_ppp_run()
+		{
+
+			PAYPAL.apps.PPP.doCheckout();
+
+		}
 	
 		var wpsg_mod_paypalapi_shipping_id = '<?php echo wpsg_getStr($this->view['basket']['checkout']['shipping']); ?>';
 		
@@ -78,7 +93,7 @@
 	
 			jQuery('input[name="wpsg_checkout2"], input[name="wpsg_checkout"]').show().bind('click', function() {
 	
-				var test = ppp.doContinue();			
+				PAYPAL.apps.PPP.doCheckout();
 				return false;
 				
 			} );
diff --git a/views/mods/mod_paypalapi/paypalplus.phtml b/views/mods/mod_paypalapi/paypalplus.phtml
index 2cecd3b..f9efe0d 100644
--- a/views/mods/mod_paypalapi/paypalplus.phtml
+++ b/views/mods/mod_paypalapi/paypalplus.phtml
@@ -12,7 +12,22 @@
 		"approvalUrl": "<?php echo $this->view['wpsg_mod_paypalapi']['approval_url']; ?>",
 		"language": "de_DE",
 		"preselection": "<?php echo (($_SESSION['wpsg']['checkout']['payment'] == '10')?'paypal':'none')?>",
-		"country": "DE",	
+		"country": "DE",
+		<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && get_the_id() == $this->get_option('wpsg_mod_onepagecheckout_page')) { ?>
+		"onContinue": function(event) {
+			
+			jQuery('#wpsg_basket_form').attr('target', 'wpsg_hiddenTarget');
+			jQuery('#wpsg_basket_form').append('<input name="wpsg_checkout" value="ppp" id="wpsg_hidden_action" />');
+			jQuery('#wpsg_basket_form').append('<input name="wpsg[checkout][payment]" value="ppp" id="wpsg_hidden_payment" />');
+			jQuery('#wpsg_basket_form').submit();
+			jQuery('#wpsg_basket_form').removeAttr('target');
+			jQuery('#wpsg_hidden_action').remove();
+			jQuery('#wpsg_hidden_payment').remove();
+			
+			//PAYPAL.apps.PPP.doCheckout();
+			
+		},
+		<?php } ?>
 		<?php if ($this->view['wpsg_order_done'] !== true) { ?>
 		"onLoad": function() { if (typeof wpsg_mod_paypalapi_load == 'function') wpsg_mod_paypalapi_load(); }, 
 		"buttonLocation": "outside",
diff --git a/views/mods/mod_paypalapi/settings_edit.phtml b/views/mods/mod_paypalapi/settings_edit.phtml
index 7efb3d2..55e15de 100644
--- a/views/mods/mod_paypalapi/settings_edit.phtml
+++ b/views/mods/mod_paypalapi/settings_edit.phtml
@@ -63,8 +63,20 @@
 <br />
 
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_aktiv', __('PayPal für neue Bestellungen erlauben', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_aktiv'), array('help' => 'wpsg_shippay_activ')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_paypalexpress', __('PayPal Express aktivieren (Button im Warenkorb)', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_paypalexpress'), array('help' => 'wpsg_mod_paypalapi_paypalexpress')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_plus_aktiv', __('PayPal Plus aktivieren', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_plus_aktiv'), array('help' => 'wpsg_mod_paypalapi_plus_aktiv')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_paypalexpress', __('PayPal Express aktivieren (Button im Warenkorb)', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_paypalexpress'), array('help' => 'wpsg_mod_paypalapi_paypalexpress')); ?>
+<div class="wpsg_mod_paypalapi_plus_aktiv">
+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_paypalexpress_forceSSL', __('SSL für ReturnURL erzwingen', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_paypalexpress_forceSSL'), array('help' => 'wpsg_mod_paypalapi_paypalexpress_forceSSL')); ?>
+	<?php echo wpsg_drawForm_Input('', __('Return URL', 'wpsg'), $this->getUrl(
+		wpsg_ShopController::URL_BASKET, 
+		'wpsg_mod_paypalapi', 
+		'startPayPalExpress', 
+		array(), 
+		((wpsg_isSizedInt($this->get_option('wpsg_mod_paypalapi_paypalexpress_forceSSL')))?true:false)
+	), array('readonly' => true, 'help' => 'wpsg_mod_paypalapi_paypalexpress_returnurl')); ?>
+	<br />
+</div>
+
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_paypalexpress_details', __('Warenkorbdetails übertragen', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_paypalexpress_details'), array('help' => 'wpsg_mod_paypalapi_paypalexpress_details')); ?>
 
 <br />
diff --git a/views/mods/mod_productvars/pv_list.phtml b/views/mods/mod_productvars/pv_list.phtml
index e046beb..d1e9e7a 100644
--- a/views/mods/mod_productvars/pv_list.phtml
+++ b/views/mods/mod_productvars/pv_list.phtml
@@ -8,7 +8,7 @@
 <?php if (is_array($this->view['data']) && sizeof($this->view['data']) > 0) { ?>
 <table class="wpsg_pv_table">
 	 <tr>
-	 	<th class="wpsg_id"><?php echo __('ID', 'wpsg'); ?></th>
+	 	<th><?php echo __('ID', 'wpsg'); ?></th>
     	<th class="wpsg_label"><?php echo __('Name', 'wpsg'); ?></th>
     	<th class="wpsg_typ"><?php echo __('Typ', 'wpsg'); ?></th>
     	<th class="wpsg_pflicht"><?php echo __('Pflicht', 'wpsg'); ?></th>
diff --git a/views/mods/mod_productvars/settings_edit.phtml b/views/mods/mod_productvars/settings_edit.phtml
index c8c161d..b895c5e 100644
--- a/views/mods/mod_productvars/settings_edit.phtml
+++ b/views/mods/mod_productvars/settings_edit.phtml
@@ -44,6 +44,14 @@
 
 </script>
 
+<br />
+	
+<div class="wpsg_productvars_form">
+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_productvars_showProduct', __('Produktvariable(n) im Produkttemplate abfragen', 'wpsg'), $this->get_option('wpsg_mod_productvars_showProduct'), array('help' => 'wpsg_mod_productvars_showProduct')); ?>
+</div>
+
+<br />
+
 <div class="wpsg_admin_box">		
 		  		
 	<div class="head">
diff --git a/views/mods/mod_produktartikel/produkt.phtml b/views/mods/mod_produktartikel/produkt.phtml
index 72548a2..5dfd869 100644
--- a/views/mods/mod_produktartikel/produkt.phtml
+++ b/views/mods/mod_produktartikel/produkt.phtml
@@ -18,19 +18,19 @@
         		'services': {
         			'facebook': {
             			'status': '<?php echo (($this->get_option('wpsg_mod_produktartikel_facebook') == '1')?'on':'off'); ?>',
-            			'dummy_img': '<?php echo WPSG_URL_CONTENT.'plugins/wpshopgermany/lib/socialshareprivacy/socialshareprivacy/images/dummy_facebook.png'; ?>'
+            			'dummy_img': '<?php echo WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/socialshareprivacy/socialshareprivacy/images/dummy_facebook.png'; ?>'
         			}, 	
     				'twitter': {
     					'status': '<?php echo (($this->get_option('wpsg_mod_produktartikel_twitter') == '1')?'on':'off'); ?>',
-    					'dummy_img': '<?php echo WPSG_URL_CONTENT.'plugins/wpshopgermany/lib/socialshareprivacy/socialshareprivacy/images/dummy_twitter.png'; ?>'
+    					'dummy_img': '<?php echo WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/socialshareprivacy/socialshareprivacy/images/dummy_twitter.png'; ?>'
 					},
 					'gplus': {
 						'status': '<?php echo (($this->get_option('wpsg_mod_produktartikel_google') == '1')?'on':'off'); ?>',
-            			'dummy_img': '<?php echo WPSG_URL_CONTENT.'plugins/wpshopgermany/lib/socialshareprivacy/socialshareprivacy/images/dummy_gplus.png'; ?>'
+            			'dummy_img': '<?php echo WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/socialshareprivacy/socialshareprivacy/images/dummy_gplus.png'; ?>'
         			}
         		},
         		'uri': '<?php echo $this->view['data']['url']; ?>',
-    			css_path: '<?php echo WPSG_URL_CONTENT; ?>plugins/wpshopgermany/lib/socialshareprivacy/socialshareprivacy/socialshareprivacy.css'    			
+    			css_path: '<?php echo WPSG_URL_CONTENT; ?>plugins/'.WPSG_FOLDERNAME.'/lib/socialshareprivacy/socialshareprivacy/socialshareprivacy.css'    			
 			} ); 
 
     	}
diff --git a/views/mods/mod_produktattribute/list.phtml b/views/mods/mod_produktattribute/list.phtml
index cb766e2..20341d0 100644
--- a/views/mods/mod_produktattribute/list.phtml
+++ b/views/mods/mod_produktattribute/list.phtml
@@ -18,8 +18,8 @@
 		<th class="col_action"></th>
 	</tr>
 	<?php foreach ($this->view['data'] as $pa) { ?>
-	<tr>
-		<td class="col_id"><?php echo $pa['id']; ?></td>
+	<tr id="pa_<?php echo $pa['id']; ?>" class="wpsg_tablerow">
+		<td class="col_id wpsg_id"><?php echo $pa['id']; ?></td>
 		<td colspan="2" id="pa_<?php echo $pa['id']; ?>_name" class="col_name wpsg_editable"><?php echo wpsg_hspc($pa['name']); ?></td>
 		<td class="col_html">
 			<a class="wpsg_icon wpsg_icon_html wpsg_icon_center" href="#" title="<?php echo __('HTML Code generieren', 'wpsg'); ?>" onclick="return wpsg_genPACode(<?php echo $pa['id']; ?>);"></a>
@@ -125,4 +125,39 @@
 	</tr>
 	<?php } ?>
 </table>
+
+<p class="wpsg_hinweis"><?php echo __('Die Reihenfolge lässt sich mittels Drag&Drop verändern.', 'wpsg'); ?>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+
+		jQuery('.wpsg_mod_produktattribute_table').sortable( {
+			helper: wpsg_Tablefix,
+			items: 'tr.wpsg_tablerow',
+			handler: '.wpsg_id',
+			update: function(event, ui) {
+
+				var wpsg_reorder = jQuery(this).sortable('serialize');
+
+				jQuery.ajax( {
+					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktattribute&noheader=1&do=reorder',
+					data: { 
+						wpsg_reorder: wpsg_reorder
+					},
+					success: function(data) {
+
+						if (data !== "1") alert(data);
+						
+					}
+				} );
+				
+			}
+		} );
+		
+	} );
+			
+/* ]]> */</script>
+
+
 <?php } ?>
\ No newline at end of file
diff --git a/views/mods/mod_rechnungen/rechnung_pdf.phtml b/views/mods/mod_rechnungen/rechnung_pdf.phtml
index 4e4b402..548438c 100644
--- a/views/mods/mod_rechnungen/rechnung_pdf.phtml
+++ b/views/mods/mod_rechnungen/rechnung_pdf.phtml
@@ -6,7 +6,7 @@
 
 	require_once WPSG_PATH_LIB.'fpdf/fpdf.php';
 	require_once WPSG_PATH_LIB.'fpdf/fpdi.php';
-	require_once WPSG_PATH_MOD.'mod_rechnungen/wpsg_fpdf.class.php';
+	require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';
   
 	global $absender_left, $absender_top, $adress_left, $adress_top, $rdata_left, $rdata_top;
 	 
@@ -139,9 +139,9 @@
 				{
 					
 					$pdf->SetFont('Arial', 'B', ((intval($text['fontsize']) > 0)?intval($text['fontsize']):10));
-					$pdf->SetTextColor($text['color']);
-					$pdf->MultiCell($text['x'], $text['y'], 5, utf8_encode($text['text'])); 
-					$pdf->SetTextColor("#000000");
+					$pdf->wpsg_SetTextColor($text['color']);
+					$pdf->wpsg_MultiCell($text['x'], $text['y'], 5, $text['text']); 
+					$pdf->wpsg_SetTextColor("#000000");
 					
 				}
 				
@@ -151,7 +151,7 @@
 		
 	}
 	//wpsg_debug($this->view); die();
-	$pdf = new wpsg_fpdf();	 
+	$pdf = new wpsg_fpdf();	
 	$pdf->SetAutoPageBreak(true, 5);
 	AddRechnungPage($this, $pdf);
 				
@@ -264,7 +264,7 @@
 		$height += 5 * ceil($produkt_text_width / $produkt_text_cell_width) + 3;
 		
 		$height_y = $pdf->getY();
-		$height = 2 + $pdf->MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, utf8_encode($produkt_text), 0, 'L', 0, $produkt_text_cell_width);
+		$height = 2 + $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, $produkt_text, 0, 'L', 0, $produkt_text_cell_width);
 		
 		//$height += 3 + 5 + $pdf->getY() - $height_y;
 		//$pdf->Cell((($this->arMwSt == "-1")?102:87), 8, $produkt_text, 0, 0, 'L');
@@ -279,28 +279,8 @@
 		
 		$pdf->setXY($prod_left + 112, $prod_top + $offset);
 		$pdf->Cell(15, 8, $p['menge'], 0, 0, 'C');
-		
-		// Preis eines Produktes
-		if ($this->view['basket']['noMwSt'] == '1')
-		{
-			
-			// Innergemeinschaftliche Lieferung, hier Netto Preis
-			$preis = $p['preis_netto'];
-			
-		}
-		else
-		{
-			
-			if ($this->getFrontendTaxview() == WPSG_BRUTTO || $this->get_option('wpsg_kleinunternehmer') == '1')
-			{
-				$preis = $p['preis_brutto'];
-			}
-			else
-			{
-				$preis = $p['preis_netto'];			
-			}
-			
-		}
+						
+		$preis = $p['preis'];
 		
 		$pdf->setXY($prod_left + 127, $prod_top + $offset);
 		$pdf->Cell(25, 8, wpsg_ff($preis, $this->get_option('wpsg_currency')), 0, 0, 'R');
@@ -325,7 +305,7 @@
 			$pdf->SetFont('Arial', 'I', 9);
 			
 			$cellY = $pdf->getY();
-			$pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, utf8_encode($produktBeschreibung), 0, 'L', 0, $produkt_text_cell_width);			
+			$pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, $produktBeschreibung, 0, 'L', 0, $produkt_text_cell_width);			
 			$pBeschreibungHeight = $pdf->getY() - $cellY - $height + 1;
 			$pdf->SetFont('Arial', '', 9);
 			
@@ -341,7 +321,7 @@
 			
 			$variInfo = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['productkey']));
 
-			$height += $pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, utf8_encode(wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key'])), 0, 'L', 0, $produkt_text_cell_width);			
+			$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width);			
 			
 			//$height += 5;
 			
@@ -360,7 +340,7 @@
 				if ($deliveryTimeProduct !== false)
 				{
 				
-					$height += $pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, utf8_encode(wpsg_translate(__('Lieferdatum: #1#', 'wpsg'), date('d.m.Y', $deliveryTimeProduct))), 0, 'L', 0, $produkt_text_cell_width);
+					$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 0.5, 5, wpsg_translate(__('Lieferdatum: #1#', 'wpsg'), date('d.m.Y', $deliveryTimeProduct)), 0, 'L', 0, $produkt_text_cell_width);
 					
 				}
 									
@@ -780,7 +760,7 @@
 	if ($this->get_option('wpsg_kleinunternehmer') == '1')
 	{
  
-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset + 5, 5, utf8_encode($this->get_option('wpsg_kleinunternehmer_text'))); 
+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset + 5, 5, $this->get_option('wpsg_kleinunternehmer_text')); 
 		$offset += 15;
 		
 	}
@@ -797,9 +777,7 @@
 			
 			$offset += 10; 
 			
-			$pdf->MultiCell($prod_left, $prod_top + $offset, 5, utf8_encode(
-				wpsg_translate(__('Lieferung: #1#', 'wpsg'), date('d.m.Y', $delivery_date))
-			));
+			$pdf->wpsg_MultiCell($prod_left, $prod_top + $offset, 5, wpsg_translate(__('Lieferung: #1#', 'wpsg'), date('d.m.Y', $delivery_date)));
 
 			$offset += 5;
 			
@@ -812,7 +790,8 @@
 	if ($this->view['fussText'] != "")
 	{
 	
-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($this->view['fussText']));
+		//$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($this->view['fussText']));		
+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $this->view['fussText']);
 		$pdf->SetFont('Arial', 'B', 9);
 		$offset += 10;	
 		
@@ -843,7 +822,7 @@
 		
 		
 		$start = $pdf->getY();
-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($shipping_adress), 0, 'L', 0, 100);
+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $shipping_adress, 0, 'L', 0, 100);
 		$offset += $pdf->getY() - $start;
 		
 		$shipping_adress = true;
@@ -864,7 +843,7 @@
 		foreach ($bvars as $bvars_id => $bvars_value)
 		{
 				
-			$bvars = $this->db->fetchRow("SELECT * FROM `".wpsg_q(WPSG_TBL_ORDERVARS)."` WHERE `id` = '".wpsg_q($bvars_id)."'");
+			$bvars = $this->db->fetchRow("SELECT * FROM `".wpsg_q(WPSG_TBL_ORDERVARS)."` WHERE `id` = '".wpsg_q($bvars_id)."' ORDER BY `pos` ASC, `id` ASC ");
 			
 			if ($bvars['typ'] == "1") // Auswahl
 			{
@@ -887,7 +866,7 @@
 		$pdf->SetFont('Arial', 'B', 9);	
 		$pdf->Text($prod_left, $prod_top + $offset, __("Angaben während der Bestellung", "wpsg").":");
 		$pdf->SetFont('Arial', '', 9);
-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($strBVars));
+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $strBVars);
 		
 	}  
 	
diff --git a/views/mods/mod_relatedproducts/settings_edit.phtml b/views/mods/mod_relatedproducts/settings_edit.phtml
index fb5e0bc..27ce0b9 100644
--- a/views/mods/mod_relatedproducts/settings_edit.phtml
+++ b/views/mods/mod_relatedproducts/settings_edit.phtml
@@ -11,7 +11,13 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_relatedproducts_showBasket', __('Zubehörprodukte im Warenkorb anpreisen', 'wpsg'), $this->get_option('wpsg_mod_relatedproducts_showBasket'), array('hint' => __('Wird unterhalb des Warenkorbes dargestellt. Alternativ kann [wpsg_relatedproducts_basket limit="5"] verwendet werden.', 'wpsg'), 'help' => 'wpsg_relatedproducts_basket')); ?>
 <div class="wpsg_mod_relatedproducts_showBasket_activ" style="display:none;">
 <?php echo wpsg_drawForm_Input('wpsg_mod_relatedproducts_showBasketLimit', __('Maximale Anzahl an angezeigten Produkten', 'wpsg'), $this->get_option('wpsg_mod_relatedproducts_showBasketLimit'), array('help' => 'wpsg_mod_relatedproducts_showBasketLimits')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_relatedproducts_showBasketTemplate', __('Tempalte für die Zubehörprodukte im Warenkorn', 'wpsg'), $this->view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showBasketTemplate'), array('help' => 'wpsg_mod_relatedproducts_showBasketTemplate')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_relatedproducts_showBasketTemplate', __('Tempalte für die Zubehörprodukte im Warenkorb', 'wpsg'), $this->view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showBasketTemplate'), array('help' => 'wpsg_mod_relatedproducts_showBasketTemplate')); ?>
+</div>
+
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_relatedproducts_showAjaxDialog', __('Zubehörprodukte im Warenkorb-Lightbox anpreisen', 'wpsg'), $this->get_option('wpsg_mod_relatedproducts_showAjaxDialog'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialog')); ?>
+<div class="wpsg_mod_relatedproducts_showAjaxDialog_activ" style="display:none;">
+<?php echo wpsg_drawForm_Input('wpsg_mod_relatedproducts_showAjaxDialogLimit', __('Maximale Anzahl an angezeigten Produkten', 'wpsg'), $this->get_option('wpsg_mod_relatedproducts_showAjaxDialogLimit'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialogLimits')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_relatedproducts_showAjaxDialogTemplate', __('Tempalte für die Zubehörprodukte in der Lightbox', 'wpsg'), $this->view['wpsg_mod_relatedproducts']['arTemplates'], $this->get_option('wpsg_mod_relatedproducts_showAjaxDialogTemplate'), array('help' => 'wpsg_mod_relatedproducts_showAjaxDialogTemplate')); ?>
 </div>
 
 <script type="text/javascript">/* <![CDATA[ */
@@ -24,6 +30,13 @@
 			else jQuery('.wpsg_mod_relatedproducts_showBasket_activ').hide();
 			
 		} ).change();
+
+		jQuery('#wpsg_mod_relatedproducts_showAjaxDialog').bind('change', function() {
+
+			if (jQuery(this).is(':checked')) jQuery('.wpsg_mod_relatedproducts_showAjaxDialog_activ').show();
+			else jQuery('.wpsg_mod_relatedproducts_showAjaxDialog_activ').hide();
+			
+		} ).change();
 		
 	} );
 
diff --git a/views/mods/mod_request/requestpage.phtml b/views/mods/mod_request/requestpage.phtml
index 1060635..4fe0164 100644
--- a/views/mods/mod_request/requestpage.phtml
+++ b/views/mods/mod_request/requestpage.phtml
@@ -168,17 +168,17 @@
 						<td class="wpsg_cell_value" colspan="<?php echo (2 + $this->view['addColspan']); ?>">
 						
 							<?php if ($pv['typ'] === '1') { $possible_options = explode('|', $pv['auswahl']); /* Auswahl */ ?>
-							<select id="wpsg_request_pv_<?php echo $pv['id']; ?>_<?php echo $request_product['product_index']; ?>" name="wpsg[request][pv][<?php echo $request_product['product_index']; ?>][<?php echo $pv['id']; ?>]">							
+							<select id="wpsg_request_pv_<?php echo $pv['id']; ?>_<?php echo $request_product['product_index']; ?>" name="wpsg[request][pv][<?php echo $request_product['product_index']; ?>][<?php echo $pv['id']; ?>]" class="<?php echo ((in_array("pv_".$pv['id'], (array)$this->view['error']))?'wpsg_error':''); ?>">							
 								<option value="-1"><?php echo __('Bitte Auswählen', 'wpsg'); ?></option>
 								<?php foreach ((array)$possible_options as $option) { ?>
 								<option value="<?php echo wpsg_hspc($option) ?>" <?php echo (($option == wpsg_hspc(wpsg_getStr($request_product['pv'][$pv['id']])))?'selected="selected"':''); ?>><?php echo wpsg_hspc($option); ?></option>
 								<?php } ?>							
 							</select>
 							<?php } else if ($pv['typ'] === '2') { /* Text */ ?>
-							<input id="wpsg_request_pv_<?php echo $pv['id']; ?>_<?php echo $request_product['product_index']; ?>" type="text" name="wpsg[request][pv][<?php echo $request_product['product_index']; ?>][<?php echo $pv['id']; ?>]" value="<?php echo wpsg_hspc(wpsg_getStr($request_product['pv'][$pv['id']])); ?>" />
+							<input id="wpsg_request_pv_<?php echo $pv['id']; ?>_<?php echo $request_product['product_index']; ?>" type="text" name="wpsg[request][pv][<?php echo $request_product['product_index']; ?>][<?php echo $pv['id']; ?>]" value="<?php echo wpsg_hspc(wpsg_getStr($request_product['pv'][$pv['id']])); ?>" class="<?php echo ((in_array("pv_".$pv['id'], (array)$this->view['error']))?'wpsg_error':''); ?>" />
 							<?php } else if ($pv['typ'] === '3') { /* Checkbox */ ?>
 							<input type="hidden" name="wpsg[request][pv][<?php echo $request_product['product_index']; ?>][<?php echo $pv['id']; ?>]" value="0" />
-							<input id="wpsg_request_pv_<?php echo $pv['id']; ?>_<?php echo $request_product['product_index']; ?>" type="checkbox" name="wpsg[request][pv][<?php echo $request_product['product_index']; ?>][<?php echo $pv['id']; ?>]" value="1" <?php echo ((wpsg_isSizedInt($request_product['pv'][$pv['id']]))?'checked="checked"':''); ?>/>							
+							<input id="wpsg_request_pv_<?php echo $pv['id']; ?>_<?php echo $request_product['product_index']; ?>" type="checkbox" name="wpsg[request][pv][<?php echo $request_product['product_index']; ?>][<?php echo $pv['id']; ?>]" value="1" <?php echo ((wpsg_isSizedInt($request_product['pv'][$pv['id']]))?'checked="checked"':''); ?> class="<?php echo ((in_array("pv_".$pv['id'], (array)$this->view['error']))?'wpsg_error':''); ?>" />							
 							<?php } ?>
 												
 						</td>
@@ -302,7 +302,7 @@
 			<?php } ?>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_geburtsdatum">
-				<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum',"wpsg"); ?>
+				<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)',"wpsg"); ?>
 				<?php if ($this->view['pflicht']['geb'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[request][customer][geb]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['geb'])); ?>" />
@@ -366,12 +366,13 @@
 			<?php if (wpsg_isSizedInt($this->get_option('wpsg_mod_request_customerdata'))) { ?>
 			<?php foreach ((array)$this->view['pflicht']['custom'] as $c_id => $c) { if ($c['show'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
-				<label class="wpsg_cv wpsg_checkout" for="wpsg_cv_<?php echo $c_id; ?>">					
-					<?php if ($c['typ'] == '0') { // Textfeld ?>
-					<?php echo wpsg_hspc(__($c['name'], 'wpsg')); ?><?php if ($c['show'] == '0') { ?> <span class="wpsg_required">*</span><?php } ?>:
-					<input id="wpsg_cv_<?php echo $c_id; ?>" class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[request][customer][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['custom'][$c_id])); ?>" />
-					<?php } else if ($c['typ'] == '1') { $arAuswahl = explode("|", $c['auswahl']); // Auswahlfeld ?>
+				<label class="wpsg_cv wpsg_checkout" for="wpsg_cv_<?php echo $c_id; ?>">
 					<?php echo wpsg_hspc(__($c['name'], 'wpsg')); ?><?php if ($c['show'] == '0') { ?> <span class="wpsg_required">*</span><?php } ?>:
+				</label>					
+				<?php if ($c['typ'] == '0') { // Textfeld ?>					
+				<input id="wpsg_cv_<?php echo $c_id; ?>" class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[request][customer][custom][<?php echo $c_id; ?>]" type="text" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['custom'][$c_id])); ?>" />
+				<?php } else if ($c['typ'] == '1') { $arAuswahl = explode("|", $c['auswahl']); // Auswahlfeld ?>
+					<?php if ($c['show'] == '0') { ?>
 					<select id="wpsg_cv_<?php echo $c_id; ?>" class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> <?php echo ((in_array("custom_".$c_id, (array)$this->view['error']))?'wpsg_error':''); ?>" name="wpsg[request][customer][custom][<?php echo $c_id; ?>]">
 						<option value="-1"><?php echo __('Bitte Auswählen', 'wpsg'); ?></option>
 						<?php foreach ((array)$arAuswahl as $a) { ?>
@@ -381,9 +382,8 @@
 					<?php } else if ($c['typ'] == '2') { // Checkbox ?>
 					<input type="hidden" name="wpsg[request][customer][custom][<?php echo $c_id; ?>]" value="0" /> 
 					<input id="wpsg_cv_<?php echo $c_id; ?>" class="<?php echo (($c['show'] == '0')?'validate[required]':''); ?> checkbox" type="checkbox" value="1" name="wpsg[request][customer][custom][<?php echo $c_id; ?>]" value="1" <?php echo ((wpsg_getStr($this->view['requestlist']['customer']['custom'][$c_id]) == '1')?'checked="checked"':''); ?> />
-					<?php echo wpsg_hspc(__($c['name'], 'wpsg')); ?><?php if ($c['show'] == '0') { ?> <span class="wpsg_required">*</span><?php } ?>					
-					<?php } ?>
-				</label>
+					<?php } ?>				
+				<?php } ?>
 			</div>
 			<?php } } ?>
 			<?php } ?>
diff --git a/views/mods/mod_skrill/order_done.phtml b/views/mods/mod_skrill/order_done.phtml
index d960073..4310854 100644
--- a/views/mods/mod_skrill/order_done.phtml
+++ b/views/mods/mod_skrill/order_done.phtml
@@ -41,7 +41,7 @@
 	<input type="hidden" name="detail1_description" value="<?php echo __('Bestellnummer', 'wpsg'); ?>:" />
 	<input type="hidden" name="detail1_text" value="<?php echo wpsg_hspc($this->view['order']['onr']); ?>" />
 		
-	<input type="image" src="<?php echo WPSG_URL_CONTENT; ?>plugins/wpshopgermany/views/mods/mod_skrill/skrill-moneybookers-payby-border_de_150x106.png" alt="<?php echo __('Bezahlen mit Skrill', 'wpsg'); ?>" />
+	<input type="image" src="<?php echo WPSG_URL_CONTENT; ?>plugins/<?php echo WPSG_FOLDERNAME; ?>/views/mods/mod_skrill/skrill-moneybookers-payby-border_de_150x106.png" alt="<?php echo __('Bezahlen mit Skrill', 'wpsg'); ?>" />
 
 	<p>
 		<?php echo __('Klicken Sie auf das Logo, um die Zahlung mit Skrill (Moneybookers) zu starten.', 'wpsg'); ?>
diff --git a/views/mods/mod_su/order_done.phtml b/views/mods/mod_su/order_done.phtml
index 2569592..38352d2 100644
--- a/views/mods/mod_su/order_done.phtml
+++ b/views/mods/mod_su/order_done.phtml
@@ -8,7 +8,7 @@
 <p><?php echo __('Um den Betrag mit Sofortüberweisung zu bezahlen klicken Sie bitte auf folgendes Logo.', 'wpsg'); ?></p>
 <p>
 	<a title="<?php echo __('Mit Sofortüberweisung bezahlen', 'wpsg'); ?>" href="<?php echo $this->view['suLink']; ?>">
-		<img src="<?php echo WPSG_URL_CONTENT.'plugins/wpshopgermany/views/gfx/'; ?>banner_300x100.png" align="left" alt="<?php echo __('Mit Sofortüberweisung bezahlen', 'wpsg'); ?>" style="margin-right:7px;">
+		<img src="<?php echo WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/views/gfx/'; ?>banner_300x100.png" align="left" alt="<?php echo __('Mit Sofortüberweisung bezahlen', 'wpsg'); ?>" style="margin-right:7px;">
 	</a>
 </p>
 <?php if ($this->get_option('wpsg_mod_su_autostart') == '1') { ?>
diff --git a/views/mods/mod_su/settings_edit.phtml b/views/mods/mod_su/settings_edit.phtml
index 0b4dd92..1dfc1b7 100644
--- a/views/mods/mod_su/settings_edit.phtml
+++ b/views/mods/mod_su/settings_edit.phtml
@@ -37,24 +37,24 @@
  	
 </script>
 
-<?php echo wpsg_drawForm_Input('wpsg_mod_su_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_su_bezeichnung')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_su_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_su_bezeichnung'), array('help' => 'wpsg_mod_su_bezeichnung')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_su_aktiv', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_su_aktiv')); ?>
-<?php echo wpsg_drawForm_Textarea('wpsg_mod_su_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_su_hint')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_su_subject1', __('Betreff für Überweisung (Zeile 1)', 'wpsg'), $this->get_option('wpsg_mod_su_subject1')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_su_subject2', __('Betreff für Überweisung (Zeile 2)', 'wpsg'), $this->get_option('wpsg_mod_su_subject2')); ?>
+<?php echo wpsg_drawForm_Textarea('wpsg_mod_su_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_su_hint'), array('help' => 'wpsg_mod_su_hint')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_su_subject1', __('Betreff für Überweisung (Zeile 1)', 'wpsg'), $this->get_option('wpsg_mod_su_subject1'), array('help' => 'wpsg_mod_su_subject1')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_su_subject2', __('Betreff für Überweisung (Zeile 2)', 'wpsg'), $this->get_option('wpsg_mod_su_subject2'), array('help' => 'wpsg_mod_su_subject2')); ?>
 <br />
-<?php echo wpsg_drawForm_Input('wpsg_mod_su_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_su_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_su_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_su_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_su_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_su_mwstland')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_su_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_su_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_su_gebuehr')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_su_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_su_mwst'), array('help' => 'wpsg_mod_su_mwst')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_su_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_su_mwstland'), array('help' => 'wpsg_mod_su_mwstland')); ?>
 
 <br />
-<?php echo wpsg_drawForm_Select('wpsg_mod_su_currency', __('Verwendete Währung', 'wpsg'), array('EUR' => __('Euro', 'wpsg'), 'CHF' => __('Schweizer Franken', 'wpsg'), 'GBP' => __('Britische Pfund', 'wpsg')), $this->get_option('wpsg_mod_su_currency')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_su_userid', __('Kunden-Nr für Sofortüberweisung.de', 'wpsg'), $this->get_option('wpsg_mod_su_userid')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_su_projectid', __('Projekt ID für Sofortüberweisung.de', 'wpsg'), $this->get_option('wpsg_mod_su_projectid')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_su_projectpassword', __('Projekt Passwort', 'wpsg'), $this->get_option('wpsg_mod_su_projectpassword')); ?>
-<?php echo wpsg_drawForm_Input('wpsg_mod_su_noticepassword', __('Benachrichtigungs Passwort', 'wpsg'), $this->get_option('wpsg_mod_su_noticepassword')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_su_language', __('Sprache bei Sofortüberweisung.de', 'wpsg'), array('DE' => __('deutsch', 'wpsg'), 'EN' => __('englisch', 'wpsg'), 'FR' => __('französisch', 'wpsg'), 'NL' => __('niederländisch', 'wpsg')), $this->get_option('wpsg_mod_su_language')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_su_hash', __('Verwendetes HASH Verfahren', 'wpsg'), array('md5' => 'MD5', 'sha1' => 'SHA1', 'sha256' => 'SHA256', 'sha512' => 'SHA512'), $this->get_option('wpsg_mod_su_hash')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_su_currency', __('Verwendete Währung', 'wpsg'), array('EUR' => __('Euro', 'wpsg'), 'CHF' => __('Schweizer Franken', 'wpsg'), 'GBP' => __('Britische Pfund', 'wpsg')), $this->get_option('wpsg_mod_su_currency'), array('help' => 'wpsg_mod_su_currency')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_su_userid', __('Kunden-Nr für Sofortüberweisung.de', 'wpsg'), $this->get_option('wpsg_mod_su_userid'), array('help' => 'wpsg_mod_su_userid')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_su_projectid', __('Projekt ID für Sofortüberweisung.de', 'wpsg'), $this->get_option('wpsg_mod_su_projectid'), array('help' => 'wpsg_mod_su_projectid')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_su_projectpassword', __('Projekt Passwort', 'wpsg'), $this->get_option('wpsg_mod_su_projectpassword'), array('help' => 'wpsg_mod_su_projectpassword')); ?>
+<?php echo wpsg_drawForm_Input('wpsg_mod_su_noticepassword', __('Benachrichtigungs Passwort', 'wpsg'), $this->get_option('wpsg_mod_su_noticepassword'), array('help' => 'wpsg_mod_su_noticepassword')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_su_language', __('Sprache bei Sofortüberweisung.de', 'wpsg'), array('DE' => __('deutsch', 'wpsg'), 'EN' => __('englisch', 'wpsg'), 'FR' => __('französisch', 'wpsg'), 'NL' => __('niederländisch', 'wpsg')), $this->get_option('wpsg_mod_su_language'), array('help' => 'wpsg_mod_su_language')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_su_hash', __('Verwendetes HASH Verfahren', 'wpsg'), array('md5' => 'MD5', 'sha1' => 'SHA1', 'sha256' => 'SHA256', 'sha512' => 'SHA512'), $this->get_option('wpsg_mod_su_hash'), array('help' => 'wpsg_mod_su_hash')); ?>
 <div class="wpsg_form_field">
 	<div class="wpsg_form_left">
 		<label for="wpsg_mod_su_confirmurl"><?php echo __('URL für HTTP Benachrichtigung', 'wpsg'); ?>:</label>
diff --git a/views/mods/mod_test/settings_edit.phtml b/views/mods/mod_test/settings_edit.phtml
index ae0e8b1..27a932f 100644
--- a/views/mods/mod_test/settings_edit.phtml
+++ b/views/mods/mod_test/settings_edit.phtml
@@ -15,7 +15,7 @@
 			<div class="fulltab">
 				<?php echo ($test_index + 1); ?>. Test - <?php echo $test['label']; ?>
 				<?php if ($this->callMod('wpsg_mod_test', 'checkTest', array($test)) === true) { ?>
-				<img src="<?php echo WPSG_URL_CONTENT; ?>plugins/wpshopgermany/views/css/../gfx/tick.png" alt="" style="float:right;" />
+				<img src="<?php echo WPSG_URL_CONTENT; ?>plugins/<?php echo WPSG_FOLDERNAME; ?>/views/css/../gfx/tick.png" alt="" style="float:right;" />
 				<?php } ?>
 			</div>
 		</div>
@@ -46,7 +46,7 @@
 						<td><?php echo $this->callMod('wpsg_mod_test', 'getValue', array($key, $test['array'])); ?></td>
 						<td>
 							<?php if ($this->callMod('wpsg_mod_test', 'checkValue', array($key, $t[1], $test['array'])) === true) { ?>
-							<img src="<?php echo WPSG_URL_CONTENT; ?>plugins/wpshopgermany/views/css/../gfx/tick.png" alt="" />
+							<img src="<?php echo WPSG_URL_CONTENT; ?>plugins/<?php echo WPSG_FOLDERNAME; ?>/views/css/../gfx/tick.png" alt="" />
 							<?php } ?>						
 						</td>
 					</tr>
diff --git a/views/mods/mod_voucherproduct/voucher_pdf.phtml b/views/mods/mod_voucherproduct/voucher_pdf.phtml
index ba94ab1..ae5a414 100644
--- a/views/mods/mod_voucherproduct/voucher_pdf.phtml
+++ b/views/mods/mod_voucherproduct/voucher_pdf.phtml
@@ -32,8 +32,7 @@
 			 
 			if ($t['alpha'] > 0) $pdf->setAlpha($t['alpha']);
 			
-			list($r, $g, $b) = wpsg_getColor($t["color"]);
-			$pdf->SetTextColor($r, $g, $b);
+			$pdf->wpsg_SetTextColor($t['color']);
 			 
 			$pdf->SetFont('Arial', '', $t['fontsize']);																	    
 	    	$pdf->RotatedText(
@@ -73,7 +72,7 @@
 			if ($t['alpha'] > 0) $pdf->setAlpha($t['alpha']);
 			
 			$pdf->SetFont('Arial', '', $t['fontsize']);
-			$pdf->SetTextColor($t["color"]);
+			$pdf->wpsg_SetTextColor($t["color"]);
 																			    
 	    	$pdf->RotatedText(
 		    	$t['x'], $t['y'], 
diff --git a/views/mods/mod_weight/settings_edit.phtml b/views/mods/mod_weight/settings_edit.phtml
index 7a3fbc9..bd703a7 100644
--- a/views/mods/mod_weight/settings_edit.phtml
+++ b/views/mods/mod_weight/settings_edit.phtml
@@ -8,6 +8,7 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_weight_unit', __('Gewichtseinheit', 'wpsg'), $this->get_option('wpsg_mod_weight_unit'), array('help' => 'wpsg_mod_weight_unit')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showProduct', __('Im Produkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showProduct'), array('help' => 'wpsg_mod_weight_showProduct')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showBasket', __('Im Warenkorb anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showBasket'), array('help' => 'wpsg_mod_weight_showBasket')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showAjaxDialog', __('In der Warenkorb-Lightbox anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showAjaxDialog'), array('help' => 'wpsg_mod_weight_showAjaxDialog')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showBasketProduct', __('Im Warenkorb im Produkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showBasketProduct'), array('help' => 'wpsg_mod_weight_showBasketProduct')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showOverview', __('In Zusammenfassung anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showOverview'), array('help' => 'wpsg_mod_weight_showOverview')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_weight_showOverviewProduct', __('In Zusammenfassung im Produkt anzeigen', 'wpsg'), $this->get_option('wpsg_mod_weight_showOverviewProduct'), array('help' => 'wpsg_mod_weight_showOverviewProduct')); ?>
diff --git a/views/mods/mod_willcollect/settings_edit.phtml b/views/mods/mod_willcollect/settings_edit.phtml
index 1a5fd1b..2b55965 100644
--- a/views/mods/mod_willcollect/settings_edit.phtml
+++ b/views/mods/mod_willcollect/settings_edit.phtml
@@ -9,6 +9,7 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_willcollect_bezeichnung'), array('help' => 'wpsg_mod_willcollect_bezeichnung')); ?>
 <?php echo wpsg_drawForm_Textarea('wpsg_mod_willcollect_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_willcollect_hint'), array('help' => 'wpsg_mod_willcollect_hint')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_willcollect_paymentneed', __('Selbstabholung erfordert Barzahlung', 'wpsg'), $this->get_option('wpsg_mod_willcollect_paymentneed'), array('help' => 'wpsg_mod_willcollect_paymentneed')); ?>
+<?php echo wpsg_drawForm_Checkbox('wpsg_mod_willcollect_dontMerge', __('Selbstabholung nicht kombinieren', 'wpsg'), $this->get_option('wpsg_mod_willcollect_dontMerge'), array('help' => 'wpsg_mod_willcollect_dontMerge')); ?>
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_adress', __('Anschrift', 'wpsg'), $this->get_option('wpsg_mod_willcollect_adress'), array('help' => 'wpsg_mod_willcollect_adress')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_street', __('Straße', 'wpsg'), $this->get_option('wpsg_mod_willcollect_street'), array('help' => 'wpsg_mod_willcollect_street')); ?>
diff --git a/views/mods/mod_wirecard/settings_edit.phtml b/views/mods/mod_wirecard/settings_edit.phtml
index 302e279..76714f0 100644
--- a/views/mods/mod_wirecard/settings_edit.phtml
+++ b/views/mods/mod_wirecard/settings_edit.phtml
@@ -66,22 +66,22 @@
 	'de' => __('Deutsch', 'wpsg'),
 	'en' => __('Englisch', 'wpsg'),
 	'fr' => __('Französisch', 'wpsg')	
-), $this->get_option('wpsg_mod_wirecard_language')); ?>
+), $this->get_option('wpsg_mod_wirecard_language'), array('help' => 'wpsg_mod_wirecard_language')); ?>
 
 <?php echo wpsg_drawForm_Input('wpsg_mod_wirecard_subject', __('Bestellbeschreibung', 'wpsg'), $this->get_option('wpsg_mod_wirecard_subject'), array('help' => 'wpsg_mod_wirecard_subject')); ?>
 
-<?php echo wpsg_drawForm_Select('wpsg_page_mod_wirecard_success', __('Erfolgsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_wirecard_success')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_page_mod_wirecard_cancel', __('Seite bei Abbruch', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_wirecard_cancel')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_page_mod_wirecard_error', __('Fehlerseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_wirecard_error')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_page_mod_wirecard_pending', __('Seite bei keinem Ergebnis', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_wirecard_pending')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_wirecard_mode', __('Integrationsmodus', 'wpsg'), array('0' => __('IFrame', 'wpsg'), '1' => __('Popup', 'wpsg'), '2' => __('Weiterleitung', 'wpsg')), $this->get_option('wpsg_mod_wirecard_mode'), array('help' => 'wpsg_mod_wirecard_mode')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_page_mod_wirecard_success', __('Erfolgsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_wirecard_success'), array('help' => 'wpsg_mod_wirecard_success')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_page_mod_wirecard_cancel', __('Seite bei Abbruch', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_wirecard_cancel'), array('help' => 'wpsg_mod_wirecard_cancel')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_page_mod_wirecard_error', __('Fehlerseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_wirecard_error'), array('help' => 'wpsg_mod_wirecard_error')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_page_mod_wirecard_pending', __('Seite bei keinem Ergebnis', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_wirecard_pending'), array('help' => 'wpsg_mod_wirecard_pending')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_wirecard_mode', __('Integrationsmodus', 'wpsg'), array('0' => __('IFrame', 'wpsg'), '1' => __('Popup', 'wpsg'), '2' => __('Weiterleitung', 'wpsg')), $this->get_option('wpsg_mod_wirecard_mode'), array('help' => 'wpsg_mod_wirecard_mode', 'help' => 'wpsg_mod_wirecard_mode')); ?>
 <div id="wpsg_mod_wirecard_mode_2" style="display:none;">
-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_wirecard_autostart', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_wirecard_autostart'), array('help' => 'wpsg_shippay_paystart')); ?>
+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_wirecard_autostart', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_wirecard_autostart'), array('help' => 'wpsg_shippay_paystart', 'help' => 'wpsg_shippay_paystart')); ?>
 </div>
 <br />
 
-<script type="text/javascript">/* <![CDATA[ */
-
+<script type="text/javascript">/* <![CDATA[ */
+
 	jQuery(document).ready(function() {
 
 		jQuery(".wpsg_mod_wirecard_paymenttypeselect").sortable().disableSelection();
@@ -120,6 +120,6 @@
 			
 		} ).change();
 		
-	} );
-
+	} );
+
 /* ]]> */</script>
\ No newline at end of file
diff --git a/views/order/index.phtml b/views/order/index.phtml
index b617090..e62011f 100644
--- a/views/order/index.phtml
+++ b/views/order/index.phtml
@@ -382,12 +382,12 @@
 						<?php echo (($o['onr'] == "")?$o['id']:$o['onr']); ?> <span class="wpsg_order_datum"><?php echo wpsg_hspc(date('d.m.Y H:i:s', strtotime($o['cdate']))); ?></span><br />
 						<?php if (trim($o['order_comment']) != '') { ?>
 						<a title="<?php echo wpsg_translate(__('Kommentar (Kunde): #1#', 'wpsg'), wpsg_hspc($o['order_comment'])); ?>" onclick="return false" href="">
-							<img alt="" src="<?php echo WPSG_URL_CONTENT; ?>plugins/wpshopgermany/views/gfx/comment.png" />
+							<img alt="" src="<?php echo WPSG_URL_CONTENT; ?>plugins/<?php echo WPSG_FOLDERNAME; ?>/views/gfx/comment.png" />
 						</a>
 						<?php } ?>
 						<?php if (trim($o['admincomment']) != "") { ?>
 						<a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($o['admincomment']); ?>" onclick="return false;" href="">
-							<img alt="" src="<?php echo WPSG_URL_CONTENT; ?>plugins/wpshopgermany/views/gfx/comment_admin.png" />
+							<img alt="" src="<?php echo WPSG_URL_CONTENT; ?>plugins/<?php echo WPSG_FOLDERNAME; ?>/views/gfx/comment_admin.png" />
 						</a>
 						<?php } ?>
 						<div class="row-actions">
diff --git a/views/order/view.phtml b/views/order/view.phtml
index 062c5c8..3bacf9f 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -417,7 +417,7 @@
 						
 					</div>					
 				</div>
-								
+							  
 				<div class="postbox" id="wpsg_orderdata">		
 					<h3 class="wpsg_handlediv">
 						<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml
index 175a6ee..9c3ce21 100644
--- a/views/produkttemplates/standard.phtml
+++ b/views/produkttemplates/standard.phtml
@@ -106,10 +106,10 @@
 						
 			<?php /* Lagerbestand START*/?>
 			<?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?>
-							<div class="wpsg_mod_produktindex_stock">
-								<?php echo wpsg_translate(__('Lagerbestand: #1#','wpsg'), $this->view['data']['stock']);  ?>	
-							</div>
-						<?php } ?>
+			<div class="wpsg_mod_produktindex_stock">
+				<?php echo wpsg_translate(__('Lagerbestand: #1#','wpsg'), $this->view['data']['stock']);  ?>	
+			</div>
+			<?php } ?>
 			<?php /* Lagerbestand ENDE*/?>
 						
 			<?php /* Lieferzeit Anzeige START */ ?>
@@ -120,7 +120,8 @@
 				</div>
 				
 			<?php } ?>
-			<?php /* Lieferzeit Anzeige ENDE */ ?> 
+			<?php /* Lieferzeit Anzeige ENDE */ ?>
+			
 			
 			<?php /* Gewichtsanzeige START */ ?>
 			<?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?>
@@ -132,10 +133,10 @@
 			
 			<?php /* Varianten START */ ?>
 			<div class="wpsg_produkt_varianten">
-			<?php echo $this->callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?>
+				<?php echo $this->callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?>
 			</div>
 			<?php /* Varianten ENDE */ ?>
-					
+										
 			<?php if ($this->callMods('productForSale', array($this->view['data']['product_key'])) || ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id'])))) { ?>
 			<div class="wpsg_produkt_add_basket_wrapper">	
 				
@@ -158,7 +159,7 @@
 								url: '<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>',
 								data:
 								{
-									wpsg_form_data: jQuery('#wpsg_produktform_<?php echo $this->getTemplateIndex(); ?>').serialize(),
+									'wpsg_form_data': jQuery('#wpsg_produktform_<?php echo $this->getTemplateIndex(); ?>').serialize(),
 									'wpsg[ajax]': '1',
 									'wpsg[submit]': '1'					
 								}, 
@@ -174,6 +175,7 @@
 									
 									<?php } ?>
 
+									wpsg_refreshBasketWidget();
 									jQuery('.wpsg_add_basket_<?php echo $this->getTemplateIndex(); ?>').prop('disabled', false);
 									
 								}
diff --git a/views/warenkorb/ajaxDialog.phtml b/views/warenkorb/ajaxDialog.phtml
index 1f5d5cc..cad27f5 100644
--- a/views/warenkorb/ajaxDialog.phtml
+++ b/views/warenkorb/ajaxDialog.phtml
@@ -9,29 +9,117 @@
 	// $this->view['amount_add'] // So oft wurde das Produkt hinzugefügt
 	// $this->view['amount_basket'] // So oft befindet sich das hinzugefügte Produkt im Warenkorb
 	// $this->view['product_data'] // Array mit Produktdaten
-	
+	// $this->view['product_index'] // Index des Produktes im Warenkorb	 	
+
 ?><div id="wpsg_basket_ajax_message">
  	
  	<div class="wpsg_basket_ajax_message_content">
+ 	 
+ 		<?php if ($this->view['error'] === true) { ?>
+
+			<h3><?php echo __('Es sind folgende Fehler aufgetreten:', 'wpsg'); ?></h3>
+
+			<?php echo $this->writeFrontendMessage(); ?>
+ 		 		 
+ 			<div class="wpsg_button_wrap">
+	 			<button class="wpsg_button wpsg_button_continue_shopping" onclick="return wpsg_basket_ajax_message_close();"><?php echo __('Weiter Einkaufen', 'wpsg'); ?></button>	 		
+	 		</div>
+	 	
+	 		<div class="wpsg_clear"></div>
  		
- 		<?php if ($this->view['error'] === true) { echo $this->writeFrontendMessage(); } else { ?>
- 		 
- 		 	<span class="wpsg_basket_ajax_message_content_success">
- 			<?php echo wpsg_translate(
- 				__('Es wurde #1#x "#2#" in den Warenkorb gelegt.', 'wpsg'),
- 				$this->view['amount_add'],
- 				$this->getProductName($this->view['product_data']['id'], true)); ?>
- 			</span>
- 				
- 		<?php } ?> 
- 		
- 		<div class="wpsg_button_wrap">
- 			<button class="wpsg_button wpsg_button_continue_shopping" onclick="return wpsg_basket_ajax_message_close();"><?php echo __('Weiter Einkaufen', 'wpsg'); ?></button>
- 			<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>"><button class="wpsg_button wpsg_button_basket"><?php echo __('Zum Warenkorb', 'wpsg'); ?></button></a>
- 			<div class="wpsg_clear"></div>
- 		</div>
- 		
- 		<?php $this->clearFrontendMessage(); ?>
+ 		<?php } else { ?>
+ 	
+	 		<div class="wpsg_basket_ajax_message_content_left">
+	 		<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?> 
+	 			<?php $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->getProduktId($this->view['product_data']['id']))); ?>
+	  			<?php if (wpsg_isSizedArray($arBilder)) { ?> 
+	  				<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($this->getProduktId($this->view['product_data']['id']), $arBilder[0], 150, 150, 's')); ?>" alt="" />
+	  			<?php } ?>
+	 		<?php } ?>
+	 		</div>
+	 		
+	 		<div class="wpsg_basket_ajax_message_content_right">
+	 		<?php if ($this->view['error'] === true) { echo $this->writeFrontendMessage(); } else { ?>
+	 		 
+	 		 	<span class="wpsg_basket_ajax_message_content_success">
+	 			<?php echo wpsg_translate(
+	 				__('Es wurde #1#x "#2#" in den Warenkorb gelegt.', 'wpsg'),
+	 				$this->view['amount_add'],
+	 				$this->getProductName($this->view['product_data']['id'], true)); ?>
+	 			</span>
+	 			<?php } ?>
+				<div class="wpsg_clear"></div>
+	 			
+	 			<?php /* Preisanzeige Start */ ?>
+	 			<div class=wpsg_ajaxdialog_form>
+	 				<?php echo __('Der Preis für das Produkt beträgt:','wpsg')?>
+	 				<?php echo wpsg_ff($this->view['product_data']['preis'], $this->get_option('wpsg_currency')); ?>
+	 			</div>
+	 			<div class="wpsg_clear"></div>
+	 			<?php /* Preisanzeige ENDE */ ?>
+	
+	 			<?php /* Füllmengenanzeige START */ ?>
+				<?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog') === '1') { ?>
+					<div class="wpsg_ajaxdialog_form">
+					<?php echo wpsg_translate(__('Füllmenge: #1# #2#', 'wpsg'),'<span class="wpsg_fmenge">'.wpsg_ff($this->view['product_data']['fmenge']).'</span>', $this->view['product_data']['feinheit']); ?> 
+					</div>	
+				<?php } ?>	
+				<div class="wpsg_clear"></div>	
+				<?php /* Füllmengenanzeige ENDE */ ?>
+	 			
+	 			<?php /* Gewichtsanzeige Start */ ?>
+	 			<?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showAjaxDialog') === '1') { ?>
+					<div class="wpsg_ajaxdialog_form">
+						<?php echo wpsg_translate(__('Gewicht: #1# #2#', 'wpsg'), '<span class="wpsg_weight"">'.wpsg_ff($this->view['product_data']['weight']).'</span>', $this->view['product_data']['weight_unit']); ?>
+					</div>
+				<?php } ?>
+				<div class="wpsg_clear"></div>
+				<?php /* Gewichtsanzeige ENDE */ ?>
+				
+			</div>
+			
+			<div class="wpsg_clear"></div>
+	 		
+	 		<?php /* Zubehörprodukte START */?>
+	 		<?php if ($this->hasMod('wpsg_mod_relatedproducts') && $this->get_option('wpsg_mod_relatedproducts_showAjaxDialog') === '1') { ?>
+	 			<?php $arRelatedProducts = $this->callMod('wpsg_mod_relatedproducts', 'getRelatedProducts', array($this->getProduktID($this->view['product_key']))); ?>
+	 			<?php if (wpsg_isSizedArray($arRelatedProducts)) { ?> 			 
+	 				<div class="wpsg_ajaxdialog_relatedproducts">
+	 				 	<h3><?php echo __('Das könnte Ihnen auch gefallen:', 'wpsg'); ?></h3>
+	 	
+	 					<div class="wpsg_clear"></div>
+	 					
+	 					<?php foreach ($arRelatedProducts as $rp_data) { $product_data = $this->loadProduktArray($rp_data['product_id']); ?>
+	 					
+	 					<div class="wpsg_ajaxdialog_productrow">
+	 						<h4><?php echo $this->getProductName($rp_data['product_id']); ?></h4>
+	 						<a href="<?php echo $this->getProduktLink($rp_data['product_id']); ?>">
+	 							<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?> 
+	 								<?php $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($rp_data['product_id'])); ?>
+	  								<?php if (wpsg_isSizedArray($arBilder)) { ?> 
+	  									<img src="<?php echo $this->callMod('wpsg_mod_produktbilder', 'makeTn', array($rp_data['product_id'], $arBilder[0], 150, 150, 's')); ?>" alt="" />
+	  								<?php } ?>
+	 							<?php } ?>
+	 						</a>
+	 					</div>
+	 					
+						<?php } ?>
+					</div>
+	 			<?php }?>	
+	 		<?php } ?>	
+	 		
+	 		<div class="wpsg_clear"></div>
+	 		<?php /* Zubehörprodukte ENDE*/?>
+	 		
+	 		<div class="wpsg_button_wrap">
+	 			<button class="wpsg_button wpsg_button_continue_shopping" onclick="return wpsg_basket_ajax_message_close();"><?php echo __('Weiter Einkaufen', 'wpsg'); ?></button>
+	 			<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>"><button class="wpsg_button wpsg_button_basket"><?php echo __('Zum Warenkorb', 'wpsg'); ?></button></a>
+	 			<div class="wpsg_clear"></div>
+	 		</div>
+	 			 		
+	 	<?php } ?>
+	 	
+	 	<?php $this->clearFrontendMessage(); ?>
  		
  	</div>
 
diff --git a/views/warenkorb/done.phtml b/views/warenkorb/done.phtml
index 78b0f55..6e7fccc 100644
--- a/views/warenkorb/done.phtml
+++ b/views/warenkorb/done.phtml
@@ -3,7 +3,7 @@
 	/**
 	 * Template, welches nach erfolgreicher Bestellung angezeigt wird
 	 */
-
+ 
 	/*
 	BestellID: <?php echo $this->view['o_id']; ?>
 	Menge aller Produkte: <?php echo $this->view['menge']; ?>
diff --git a/views/warenkorb/index.phtml b/views/warenkorb/index.phtml
index b03d426..d02ff16 100644
--- a/views/warenkorb/index.phtml
+++ b/views/warenkorb/index.phtml
@@ -94,6 +94,9 @@
 	<?php } ?>
 	
 	<ul>
+		<?php if ($this->view['wpsg_widgetsettings']['wpsg_requestpage'] == 1) { ?>
+		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_REQUEST); ?>"><?php echo get_the_title($this->get_option('wpsg_page_request')); ?></a></li>
+		<?php } ?>
 		<?php if ($this->view['wpsg_widgetsettings']['wpsg_agbpage'] == 1) { ?>
 		<li class="page_item"><a href="<?php echo $this->getURL(wpsg_ShopController::URL_AGB); ?>"><?php echo get_the_title($this->get_option('wpsg_page_agb')); ?></a></li>
 		<?php } ?>
diff --git a/views/warenkorb/messageDialog.phtml b/views/warenkorb/messageDialog.phtml
new file mode 100644
index 0000000..96ca5c1
--- /dev/null
+++ b/views/warenkorb/messageDialog.phtml
@@ -0,0 +1,33 @@
+<?php
+
+	/**
+	 * Template wird verwendet wenn Meldungen vom Shop nicht ausgegeben werden konnte.
+	 * Beispielsweise wenn Produktvariable auf einem Produkttemplate abgefragt und Pflichtfeld ist 
+	 */
+
+?>
+
+<div id="wpsg_basket_ajax_message_wrap">
+	<div id="wpsg_basket_ajax_message">
+		<div class="wpsg_basket_ajax_message_content">
+			<?php echo $this->writeFrontendMessage(); $this->clearFrontendMessage(); ?>	
+			<br />
+			<input type="button" id="wpsg_basket_messageDialog_closeButton" value="<?php echo __('Schließen', 'wpsg'); ?>" />			
+		</div>
+	</div>
+	<div id="wpsg_basket_ajax_layer"></div></div>
+				
+<script type="text/javascript">/* <![CDATA[ */
+
+	jQuery(document).ready(function() {
+
+		jQuery('#wpsg_basket_messageDialog_closeButton, #wpsg_basket_ajax_layer').bind('click', function() {
+			
+			jQuery('#wpsg_basket_ajax_message').remove(); 
+			jQuery('#wpsg_basket_ajax_layer').remove();
+			
+		} );
+		
+	} );
+                                            
+/* ]]> */</script>
\ No newline at end of file
diff --git a/views/warenkorb/progress.phtml b/views/warenkorb/progress.phtml
index 786527c..acd7bbe 100644
--- a/views/warenkorb/progress.phtml
+++ b/views/warenkorb/progress.phtml
@@ -1,60 +1,55 @@
+<?php 
 
-<div class="wpsg_progress">
-		
-	<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>">		
+	/**
+	 * Fortschrittsbalken
+	 */
+
+?>
+
+<div class="wpsg_progress <?php echo (($this->get_option('wpsg_mod_onepagecheckout') == '')?'':'only3steps'); ?>">
+      
+	<a href="<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET); ?>">      
 		<span class="step step1 <?php echo (($GLOBALS['step'] === 1)?'current':'done'); ?>" title="<?php echo __('Hier gelangen Sie zum Warenkorb', 'wpsg'); ?>"><span class="dot"></span><span class="text"><?php echo __('Warenkorb', 'wpsg'); ?></span></span>
 	</a>
-	
-	<?php if ($GLOBALS['step'] > 1) { ?>
-	<a href=""><?php } ?>
+        
+	<?php if ($this->get_option('wpsg_mod_onepagecheckout') == '') { ?>
+           
+	<?php if ($GLOBALS['step'] > 1) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>"><?php } ?>
 	<span class="step step2 <?php echo (($GLOBALS['step'] ===2)?'current':''); ?> <?php echo (($GLOBALS['step'] > 2)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Formular der Kundendaten', 'wpsg'); ?>">
 		<span class="dot"></span><span class="text"><?php echo __('Kundendaten', 'wpsg'); ?></span>
-	</span>
-	<?php if ($GLOBALS['step'] > 1) { ?>
-	</a><?php } ?>
+	</span>            
+	<?php if ($GLOBALS['step'] > 1) { ?></a><?php } ?>
 	
-	<?php if ($GLOBALS['step'] > 2) { ?>
-	<a href=""><?php } ?>
+	<?php if ($GLOBALS['step'] > 2) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT2); ?>"><?php } ?>
 	<span class="step step3 <?php echo (($GLOBALS['step'] === 3)?'current':''); ?> <?php echo (($GLOBALS['step'] > 3)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zur Auswahl der Bezahlmethode und der Versandart', 'wpsg'); ?>">
 		<span class="dot"></span><span class="text"><?php echo __('Zahlung / Versand', 'wpsg'); ?></span>
-	</span>
-	<?php if ($GLOBALS['step'] > 2) { ?>
-	</a><?php } ?>
-	
-	<?php if ($GLOBALS['step'] > 3) { ?>
-	<a href=""><?php } ?>
+	</span>            
+	<?php if ($GLOBALS['step'] > 2) { ?></a><?php } ?>
+            
+	<?php if ($GLOBALS['step'] > 3) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_OVERVIEW); ?>"><?php } ?>
 	<span class="step step4 <?php echo (($GLOBALS['step'] === 4)?'current':''); ?> <?php echo (($GLOBALS['step'] > 4)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Bestellübersicht', 'wpsg'); ?>">
 		<span class="dot"></span><span class="text"><?php echo __('Abschluß', 'wpsg'); ?></span>
 	</span>
-	<?php if ($GLOBALS['step'] > 3) { ?>
-	</a><?php } ?>
-
-</div>
-
-<div class="wpsg_clear"></div>
-
-<?php /* ?>
-<div class="steps">
-	
-	<a class="step1 <?php echo (($GLOBALS['step'] === 1)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_BASKET); ?>" title="<?php echo __('Hier gelangen Sie zum Warenkorb', 'wpsg'); ?>"><span><?php echo __('Warenkorb', 'wpsg'); ?></span></a>
-	
-	<?php if ($GLOBALS['step'] > 1) { ?>
-	<a class="step2 <?php echo (($GLOBALS['step'] === 2)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>" title="<?php echo __('Hier gelangen Sie zum Formular der Kundendaten', 'wpsg'); ?>"><span><?php echo __('Kundendaten', 'wpsg'); ?></span></a>
+	<?php if ($GLOBALS['step'] > 3) { ?></a><?php } ?>
+   
 	<?php } else { ?>
-	<p class="step2"><span><?php echo __('Kundendaten','wpsg')?></span></p>		
-	<?php } ?>
-	
-	<?php if ($GLOBALS['step'] > 2) { ?>
-	<a class="step3 <?php echo (($GLOBALS['step'] === 3)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT2); ?>" title="<?php echo __('Hier gelangen Sie zur Auswahl der Bezahlmethode und der Versandart', 'wpsg'); ?>"><span><?php echo __('Bezahlung', 'wpsg'); ?></span></a>
-	<?php } else { ?>	
-	<p class="step3"><span><?php echo __('Bezahlung','wpsg')?></span></p>		
-	<?php } ?>
+        	
+		<?php /* Onepagecheckout */ ?>
+		<?php if ($GLOBALS['step'] > 1) { ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_CHECKOUT); ?>"><?php } ?>
+		<span class="step step2 <?php echo (($GLOBALS['step'] ===2)?'current':''); ?> <?php echo (($GLOBALS['step'] > 2)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Formular der Kundendaten, Bezahlmethode und der Versandart', 'wpsg'); ?>">
+			<span class="dot"></span><span class="text"><?php echo __('Kundendaten / Zahlung  / Versand', 'wpsg'); ?></span>
+		</span>
+		<?php if ($GLOBALS['step'] > 1) { ?></a><?php } ?>
 	
-	<?php if ($GLOBALS['step'] > 3) { ?>
-	<a class="step4 <?php echo (($GLOBALS['step'] === 4)?'current':''); ?>" href="<?php echo $this->getURL(wpsg_ShopController::URL_OVERVIEW); ?>" title="<?php echo __('Hier gelangen Sie zum Bestellübersicht', 'wpsg'); ?>"><span><?php echo __('Abschluss', 'wpsg'); ?></span></a>
-	<?php } else { ?>
-	<p class="step4"><span><?php echo __('Abschluss','wpsg')?></span></p>
+		<?php if ($GLOBALS['step'] > 2) { ?><a href=""><?php } ?>
+		<span class="step step3 <?php echo (($GLOBALS['step'] === 3)?'current':''); ?> <?php echo (($GLOBALS['step'] > 3)?'done':''); ?>" title="<?php echo __('Hier gelangen Sie zum Bestellübersicht', 'wpsg'); ?>">
+			<span class="dot"></span><span class="text"><?php echo __('Abschluß', 'wpsg'); ?></span>
+		</span>
+		<?php if ($GLOBALS['step'] > 2) { ?></a><?php } ?>
+   
 	<?php } ?>
 
-</div> */ ?>
+</div>
+
+<div class="wpsg_clear"></div>
 	
\ No newline at end of file
-- 
cgit v1.2.3