From ce6714549de0e5898332b5ef2b09b8b3dd5c9512 Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Mon, 9 Jan 2017 12:16:47 +0000
Subject: Überprüfung und Korrektur Hilfe-Buttons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6006 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_deliverynote/settings_edit.phtml         | 10 +++++++---
 views/mods/mod_downloadplus/settings_edit.phtml         | 12 ++++++------
 views/mods/mod_flexipay/settings_edit.phtml             |  2 +-
 views/mods/mod_giropay/settings_edit.phtml              |  6 +++---
 views/mods/mod_keygen/settings_edit.phtml               | 11 ++++++-----
 views/mods/mod_micropayment/settings_edit.phtml         |  4 ++--
 views/mods/mod_packagetracking/settings_edit_list.phtml |  4 ++--
 views/mods/mod_rechnungen/settings_edit.phtml           | 10 +++++++---
 views/mods/mod_relatedproducts/settings_edit.phtml      |  2 +-
 views/mods/mod_userpayment/list.phtml                   | 15 ++++++++-------
 views/mods/mod_versandarten/list.phtml                  | 16 ++++++++--------
 views/mods/mod_voucherproduct/settings_edit.phtml       |  8 +++++---
 views/mods/mod_wirecard/settings_edit.phtml             |  2 +-
 13 files changed, 57 insertions(+), 45 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_deliverynote/settings_edit.phtml b/views/mods/mod_deliverynote/settings_edit.phtml
index edb8b19..4cb420b 100644
--- a/views/mods/mod_deliverynote/settings_edit.phtml
+++ b/views/mods/mod_deliverynote/settings_edit.phtml
@@ -18,12 +18,13 @@
             <?php echo wpsg_drawForm_Input('wpsg_mod_deliverynote_adressrow', __('Adresszeile', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_adressrow'), array('help' => 'wpsg_mod_deliverynote_adressrow')); ?>
 
             <?php echo wpsg_drawForm_TextStart(); ?>
+                <div style="position:relative;">
                 <?php if ($this->view['wpsg_mod_deliverynote']['bp'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
                 <?php } else { ?>
                 <a href="<?php echo $this->view['wpsg_mod_deliverynote']['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
                 <?php } ?>
-                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
+                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp" data-wpsg-tip="mod_deliverynote_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_bp"></a>
                 <input type="file" name="wpsg_mod_deliverynote_bp">
                 <?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['bp'] !== false) { $strSuffix = '
                     <label>
@@ -31,15 +32,17 @@
 					</label>';
 					echo __($strSuffix);
 			} ?>
+			</div>
             <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_deliverynote_bp')); ?>
 
             <?php echo wpsg_drawForm_TextStart(); ?>
+                <div style="position:relative;">
                 <?php if ($this->view['wpsg_mod_deliverynote']['logo'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Logo hochgeladen', 'wpsg'); ?></p>
                 <?php } else { ?>
                 <a href="<?php echo $this->view['wpsg_mod_deliverynote']['logo']; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>
                 <?php } ?>
-                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
+                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo" data-wpsg-tip="mod_deliverynote_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_deliverynote_logo"></a>
                 <input type="file" name="wpsg_mod_deliverynote_logo">
                 <?php $strSuffix = ''; if ($this->view['wpsg_mod_deliverynote']['logo'] !== false) { $strSuffix = '  
 					<label>
@@ -47,6 +50,7 @@
 					</label>';
 					echo __($strSuffix);
 				} ?>
+				</div>
             <?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_deliverynote_logo')); ?>
 
 			<br />
@@ -133,7 +137,7 @@
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverynote_url_standard', __('URL Benachrichtigung standardmäßig aktiv', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_url_standard'), array('help' => 'wpsg_mod_deliverynote_url_standard')); ?>
 			
 			<?php if ($this->hasMod('wpsg_mod_produktattribute') == '1') {?>
-				<?php echo wpsg_drawForm_Checkbox('wpsg_rechnungen_produktattribute', __('Produktattribute auf der Rechnung anzeigen', 'wpsg'), $this->get_option('wpsg_rechnungen_produktattribute'), array('help' => 'wpsg_rechnungen_produktattribute')); ?>			
+				<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverynote_produktattribute', __('Produktattribute auf dem Lieferschein anzeigen', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_produktattribute'), array('help' => 'wpsg_mod_deliverynote_produktattribute')); ?>			
 			<?php }?>
 			
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_deliverynote_hideCountry', __('Land auf Lieferschein verbergen', 'wpsg'), $this->get_option('wpsg_mod_deliverynote_hideCountry'), array('help' => 'wpsg_mod_deliverynote_hideCountry')); ?>
diff --git a/views/mods/mod_downloadplus/settings_edit.phtml b/views/mods/mod_downloadplus/settings_edit.phtml
index 293b873..2a37a18 100644
--- a/views/mods/mod_downloadplus/settings_edit.phtml
+++ b/views/mods/mod_downloadplus/settings_edit.phtml
@@ -53,16 +53,16 @@
             <?php echo wpsg_drawForm_Checkbox('wpsg_mod_downloadplus_securitynote', __('Bemerkungen erlauben', 'wpsg'), $this->get_option('wpsg_mod_downloadplus_securitynote')); ?>
 
             <?php echo wpsg_drawForm_TextStart(); ?>
-            <p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadcronmail'); ?></p>
-			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht"></a>
+            <?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadcronmail'); ?>
+			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht" class="glyphicon glyphicon-question-sign" data-wpsg-tip="mod_pdfdownload_individualisierungsbericht" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_individualisierungsbericht"></a>
             <?php echo wpsg_drawForm_TextEnd(__('Mail für Individualisierungsbericht', 'wpsg'), array('noP' => true)); ?>
             <?php echo wpsg_drawForm_TextStart(); ?>
-            <p><?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadfiles'); ?></p>
-			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail"></a>
+            <?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#pdfdownloadfiles'); ?>
+			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail" class="glyphicon glyphicon-question-sign" data-wpsg-tip="mod_pdfdownload_kundenmail" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_kundenmail"></a>
             <?php echo wpsg_drawForm_TextEnd(__('Mail für Downloads an Kunden', 'wpsg'), array('noP' => true)); ?>
             <?php echo wpsg_drawForm_TextStart(); ?>
-            <p><?php echo (($this->get_option('wpsg_lastCron') > 0)?wpsg_formatTimestamp($this->get_option('wpsg_lastCron')):__('Noch nicht ausgeführt', 'wpsg')); ?></p>
-			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron"></a>
+            <?php echo (($this->get_option('wpsg_lastCron') > 0)?wpsg_formatTimestamp($this->get_option('wpsg_lastCron')):__('Noch nicht ausgeführt', 'wpsg')); ?>
+			<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron" class="glyphicon glyphicon-question-sign" data-wpsg-tip="mod_pdfdownload_einstellungen_cron" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_einstellungen_cron"></a>
             <?php echo wpsg_drawForm_TextEnd(__('Letzte Ausführung des Crons', 'wpsg'), array('noP' => true)); ?>
 
         </div>
diff --git a/views/mods/mod_flexipay/settings_edit.phtml b/views/mods/mod_flexipay/settings_edit.phtml
index 460b187..a504b91 100644
--- a/views/mods/mod_flexipay/settings_edit.phtml
+++ b/views/mods/mod_flexipay/settings_edit.phtml
@@ -69,7 +69,7 @@
 	'en' => __('Englisch', 'wpsg')
 ), $this->get_option('wpsg_mod_flexipay_language'), array('help' => 'wpsg_mod_flexipay_language')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_flexipay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_flexipay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_flexipay_gebuehr')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_flexipay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_flexipay_mwst')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_flexipay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_flexipay_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_flexipay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_flexipay_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
 <br />
 
diff --git a/views/mods/mod_giropay/settings_edit.phtml b/views/mods/mod_giropay/settings_edit.phtml
index 3d526ca..ce7446a 100755
--- a/views/mods/mod_giropay/settings_edit.phtml
+++ b/views/mods/mod_giropay/settings_edit.phtml
@@ -25,7 +25,7 @@
 			<?php echo wpsg_drawForm_Textarea('wpsg_mod_giropay_giropay_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_giropay_giropay_hint'), array('help' => 'wpsg_shippay_hint')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_giropay_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_giropay_giropay_logo'), array('help' => 'wpsg_shippay_logo')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_giropay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_giropay_giropay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_giropay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_giropay_mwst')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_giropay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_giropay_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 			
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_giropay_giropay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_giropay_giropay_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
 		</div>
@@ -45,7 +45,7 @@
 			<?php echo wpsg_drawForm_Textarea('wpsg_mod_giropay_creditcard_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_giropay_creditcard_hint'), array('help' => 'wpsg_shippay_hint')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_creditcard_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_giropay_creditcard_logo'), array('help' => 'wpsg_shippay_logo')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_creditcard_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_giropay_creditcard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_creditcard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_creditcard_mwst')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_creditcard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_creditcard_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_giropay_creditcard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_giropay_creditcard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
 		</div>
 	</div>
@@ -64,7 +64,7 @@
 			<?php echo wpsg_drawForm_Textarea('wpsg_mod_giropay_directdebit_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_giropay_directdebit_hint'), array('help' => 'wpsg_shippay_hint')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_directdebit_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_giropay_directdebit_logo'), array('help' => 'wpsg_shippay_logo')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_giropay_directdebit_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_giropay_directdebit_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
-			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_directdebit_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_directdebit_mwst')); ?>
+			<?php echo wpsg_drawForm_Select('wpsg_mod_giropay_directdebit_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_directdebit_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_giropay_directdebit_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_giropay_directdebit_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
 		</div>
 	</div>
diff --git a/views/mods/mod_keygen/settings_edit.phtml b/views/mods/mod_keygen/settings_edit.phtml
index a45ff27..53fb44b 100644
--- a/views/mods/mod_keygen/settings_edit.phtml
+++ b/views/mods/mod_keygen/settings_edit.phtml
@@ -15,6 +15,7 @@
 	<?php echo wpsg_drawForm_Input('wpsg_mod_keygen[wpsg_mod_keygen_maxver]', __('Maximale Versionsnummer', 'wpsg'), ((isset($_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_maxver']))?$_SESSION['wpsg_mod_keygen']['wpsg_mod_keygen_maxver']:'9.9.9')); ?>
 		
 	<?php 
+	include WPSG_PATH.'/system/module.php';
 	echo wpsg_drawForm_TextStart();
 	echo wpsg_drawForm_TextEnd(__('Module', 'wpsg'), array('noP' => true));
 	
@@ -23,16 +24,16 @@
 	// Lizenz = 1	Light Version
 	// Lizenz = 2	Pro Version
 	// Lizenz = 3	Enterprise Version
-	foreach ($this->arModule as $k => $v) { $i ++;
+	foreach ($arModule as $k => $v) { $i ++;
 		$mname = $k;
-		$lic = $v->lizenz;
+		//$lic = $v->lizenz;
 		//if ((key_exists('name', $v)) && ($lic == 1))
-		if ((key_exists('name', $v)))
+		//if ((key_exists('name', $v)))
 		{
-			$vname = $v->name;
+			//$vname = $v->name;
 
 			$chk = (@key_exists($mname, $_SESSION['wpsg_mod_keygen']['mods'] == '1'))?1:0;
-			echo wpsg_drawForm_Checkbox('wpsg_mod_keygen[mods][]', __($vname, 'wpsg'), 
+			echo wpsg_drawForm_Checkbox('wpsg_mod_keygen[mods][]', __($mname, 'wpsg'), 
 				$chk, array('value' => wpsg_hspc($mname),
 							'noHidden' => true,
 							'fullWidth' => true
diff --git a/views/mods/mod_micropayment/settings_edit.phtml b/views/mods/mod_micropayment/settings_edit.phtml
index 8d9887b..5335fd6 100644
--- a/views/mods/mod_micropayment/settings_edit.phtml
+++ b/views/mods/mod_micropayment/settings_edit.phtml
@@ -31,7 +31,7 @@
 			<?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_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_gebuehr')); ?>
 			<?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>
@@ -52,7 +52,7 @@
 			<?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')); ?>			
+			<?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_mwstland')); ?>			
 		</div>
 	</div>
 </div>
diff --git a/views/mods/mod_packagetracking/settings_edit_list.phtml b/views/mods/mod_packagetracking/settings_edit_list.phtml
index 173687a..9dda1d6 100644
--- a/views/mods/mod_packagetracking/settings_edit_list.phtml
+++ b/views/mods/mod_packagetracking/settings_edit_list.phtml
@@ -25,7 +25,7 @@
 		<td class="wpsg_value wpsg_editable" id="tp_<?php echo $p['id']; ?>_name"><?php echo wpsg_hspc(__($p['name'], 'wpsg')); ?></td>
 		<td class="wpsg_delcol">
 			
-			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name"></a>
+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_mod_packagetracking_name" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_name"></a>
 		
 		</td>
 	</tr>
@@ -34,7 +34,7 @@
 		<td class="wpsg_value wpsg_editable" id="tp_<?php echo $p['id']; ?>_url"><?php echo $p['url']; ?></td>
 		<td class="wpsg_delcol">
 		
-			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url"></a>
+			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_mod_packagetracking_url" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_mod_packagetracking_url"></a>
 							
 			<script type="text/javascript">/* <![CDATA[ */
 
diff --git a/views/mods/mod_rechnungen/settings_edit.phtml b/views/mods/mod_rechnungen/settings_edit.phtml
index 8f728e8..874df12 100644
--- a/views/mods/mod_rechnungen/settings_edit.phtml
+++ b/views/mods/mod_rechnungen/settings_edit.phtml
@@ -21,12 +21,13 @@
 			<br />
 -->		
             <?php echo wpsg_drawForm_TextStart(); ?>
+            	<div style="position:relative;">
                 <?php if ($this->view['bp'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
                 <?php } else { ?>
                 <a href="<?php echo $this->view['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
                 <?php } ?>
-                <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp"></a>
+                <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp" data-wpsg-tip="mod_rechnung_bp" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_bp"></a>
                 <input type="file" name="wpsg_rechnungen_bp">
                 <?php $strSuffix = ''; if ($this->view['bp'] !== false) { $strSuffix = '
                     <label>
@@ -34,15 +35,17 @@
 					</label>';
 					echo __($strSuffix);
                 } ?>
+				</div>
             <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_rechnungen_bp')); ?>
 
             <?php echo wpsg_drawForm_TextStart(); ?>
+            	<div style="position:relative;">
                 <?php if ($this->view['logo'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Logo hochgeladen', 'wpsg'); ?></p>
                 <?php } else { ?>
                 <a href="<?php echo $this->view['logo']; ?>" target="_blank"><?php echo __('Derzeitiges Logo', 'wpsg'); ?></a>
                 <?php } ?>
-                <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo"></a>
+                <a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign form-control-feedback" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo" data-wpsg-tip="mod_rechnung_logo" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_logo"></a>
                 <input type="file" name="wpsg_rechnungen_logo">
                 <?php $strSuffix = ''; if ($this->view['logo'] !== false) { $strSuffix = '
                     <label>
@@ -50,6 +53,7 @@
 					</label>';
                 	echo __($strSuffix);
                 } ?>
+                </div>
             <?php echo wpsg_drawForm_TextEnd(__('Logo (JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_rechnungen_bp')); ?>
 
 <!--		
@@ -98,7 +102,7 @@
 					</td>
 					<td>			
 						<label><input type="checkbox" value="1" name="text[<?php echo $f; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$f]['aktiv']))?'checked="checked"':''); ?> />&nbsp;<?php echo __("Aktiv", "wpsg"); ?></label>
-						<a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig"></a>
+						<a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig" data-wpsg-tip="mod_rechnung_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_rechnung_fieldconfig"></a>
 					</td>
 				</tr>
 				<?php } ?>
diff --git a/views/mods/mod_relatedproducts/settings_edit.phtml b/views/mods/mod_relatedproducts/settings_edit.phtml
index 27ce0b9..3c6a602 100644
--- a/views/mods/mod_relatedproducts/settings_edit.phtml
+++ b/views/mods/mod_relatedproducts/settings_edit.phtml
@@ -11,7 +11,7 @@
 <?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 Warenkorb', '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', __('Template 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')); ?>
diff --git a/views/mods/mod_userpayment/list.phtml b/views/mods/mod_userpayment/list.phtml
index 68ca5ec..550fd1a 100644
--- a/views/mods/mod_userpayment/list.phtml
+++ b/views/mods/mod_userpayment/list.phtml
@@ -15,12 +15,13 @@
 	<div id="wpsg_mod_userpayment_row_<?php echo $zv['id']; ?>">
 
         <?php echo wpsg_drawForm_TextStart(); ?>
-        <?php echo $zv['id']; ?><a data-id="<?php echo $zv['id']; ?>" class="wpsg_oc_removeLink" href="#"><span class="wpsg_glyphicon_right glyphicon glyphicon-trash"></span></a>
+        <?php echo $zv['id']; ?><a data-id="<?php echo $zv['id']; ?>" class="wpsg_oc_removeLink" href="#"><span class="wpsg_glyphicon_right glyphicon glyphicon-trash form-control-feedback"></span></a>
         <?php echo wpsg_drawForm_TextEnd(__('ID', 'wpsg')); ?>
 
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="zv_name_<?php echo $zv['id']; ?>"><?php echo $zv['name']; ?></span>
-        <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
+        <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_name"
+         rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Bezeichnung', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#zv_name_<?php echo $zv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
@@ -33,7 +34,7 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
 		<input type="checkbox" value="1" <?php echo (($zv['aktiv'] == '1')?'checked="checked"':''); ?> id="zv_<?php echo $zv['id']; ?>_aktiv" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_activ" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Aktiv', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
 			jQuery('#zv_<?php echo $zv['id']; ?>_aktiv').bind('change', function() {
@@ -54,7 +55,7 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="zv_hint_<?php echo $zv['id']; ?>"><?php echo wpsg_hspc($zv['hint']); ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_hint" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Hinweistext', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#zv_hint_<?php echo $zv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
@@ -67,7 +68,7 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="zv_rabgeb_<?php echo $zv['id']; ?>"><?php echo wpsg_hspc($zv['rabgeb']); ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_gebuehr" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_gebuehr"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Gebühr/Rabatt', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#zv_rabgeb_<?php echo $zv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
@@ -83,7 +84,7 @@
         	$tax_groups = wpsg_tax_groups();
         	echo wpsg_hspc($tax_groups[$zv['mwst_key']]);
         ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_mwst" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Steuersatz', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#zv_mwst_key_<?php echo $zv['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1', {
@@ -98,7 +99,7 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
 		<input type="checkbox" value="1" <?php echo (($zv['mwst_laender'] == '1')?'checked="checked"':''); ?> id="zv_mwst_laender_<?php echo $zv['id']; ?>" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_mwstland" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Keine MwSt. wenn Land steuerfrei', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
 			jQuery('#zv_mwst_laender_<?php echo $zv['id']; ?>').bind('change', function() {
diff --git a/views/mods/mod_versandarten/list.phtml b/views/mods/mod_versandarten/list.phtml
index 173bac9..022b348 100644
--- a/views/mods/mod_versandarten/list.phtml
+++ b/views/mods/mod_versandarten/list.phtml
@@ -24,7 +24,7 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="va_name_<?php echo $va['id']; ?>"><?php echo $va['name']; ?></span>
-        <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
+        <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_name" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_name"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Bezeichnung', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#va_name_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
@@ -37,7 +37,7 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
 		<input type="checkbox" value="1" <?php echo (($va['aktiv'] == '1')?'checked="checked"':''); ?> id="va_<?php echo $va['id']; ?>_aktiv" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_activ" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_activ"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Aktiv', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
 			jQuery('#va_<?php echo $va['id']; ?>_aktiv').bind('change', function() {
@@ -58,7 +58,7 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="va_hint_<?php echo $va['id']; ?>"><?php echo wpsg_hspc($va['hint']); ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_hint" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Hinweistext', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#va_hint_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
@@ -73,7 +73,7 @@
         <span id="va_typ_<?php echo $va['id']; ?>"><?php
         echo wpsg_hspc($this->view['arTypen'][$va['typ']]);
         ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_grundlage" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_grundlage"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Grundlage', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#va_typ_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
@@ -94,7 +94,7 @@
         	<?php echo __('Alle Versandzonen', 'wpsg'); ?>
         	<?php } ?>
         </span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_versandzone" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Versandzone', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#va_vz_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
@@ -109,7 +109,7 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
         <span id="va_kosten_<?php echo $va['id']; ?>"><?php echo wpsg_hspc($va['kosten']); ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_hint" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_kostenschluessel" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_kostenschluessel"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Kostenschlüssel', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#va_kosten_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
@@ -144,7 +144,7 @@
         	$tax_groups = wpsg_tax_groups();
         	echo wpsg_hspc($tax_groups[$va['mwst_key']]);
         ?></span>
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_mwst" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwst"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Steuersatz', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
             jQuery('#va_mwst_key_<?php echo $va['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
@@ -159,7 +159,7 @@
 
         <?php echo wpsg_drawForm_TextStart(); ?>
 		<input type="checkbox" value="1" <?php echo (($va['mwst_laender'] == '1')?'checked="checked"':''); ?> id="va_mwst_laender_<?php echo $va['id']; ?>" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
+		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_mwstland" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Keine MwSt. wenn Land steuerfrei', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
 			jQuery('#va_mwst_laender_<?php echo $va['id']; ?>').bind('change', function() {
diff --git a/views/mods/mod_voucherproduct/settings_edit.phtml b/views/mods/mod_voucherproduct/settings_edit.phtml
index e07f6b3..eedbfeb 100644
--- a/views/mods/mod_voucherproduct/settings_edit.phtml
+++ b/views/mods/mod_voucherproduct/settings_edit.phtml
@@ -20,12 +20,13 @@
 		<div role="tabpanel" class="tab-pane active" id="tab1" >	
 
             <?php echo wpsg_drawForm_TextStart(); ?>
+            	<div style="position:relative;">
                 <?php if ($this->view['bp'] === false) { ?>
                 <p><?php echo __('Es wurde bisher kein Briefpapier hochgeladen', 'wpsg'); ?></p>
                 <?php } else { ?>
                 <a href="<?php echo $this->view['bp']; ?>" target="_blank"><?php echo __('Derzeitiges Briefpapier', 'wpsg'); ?></a>
                 <?php } ?>
-                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper"></a>
+                <a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="mod_voucherproduct_paper" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_paper"></a>
                 <input type="file" name="wpsg_mod_voucherproduct_bp">
                 <?php $strSuffix = ''; if ($this->view['bp'] !== false) { $strSuffix = '
                     <label>
@@ -33,6 +34,7 @@
 					</label>';
 					echo __($strSuffix);
                 } ?>
+                </div>
             <?php echo wpsg_drawForm_TextEnd(__('Briefpapier (PDF/JPG)', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?>
 
 			<?php echo wpsg_drawForm_Input('wpsg_voucherproduct_width', __('Breite des PDFs in mm', 'wpsg'), $this->get_option('wpsg_voucherproduct_width'), array ('rAlign' => true, 'help' => 'wpsg_voucherproduct_width')); ?>
@@ -40,7 +42,7 @@
 
             <?php echo wpsg_drawForm_TextStart(); ?>
 				<?php echo wpsg_translate(__('Kann <a href="#1#">hier</a> konfiguriert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#gutscheinproductmail'); ?>
-				<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" style="float:right;" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail"></a>
+				<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="mod_voucherproduct_mail" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_mail"></a>
 				
 	        <?php echo wpsg_drawForm_TextEnd(__('Gutscheinmail an Kunden', 'wpsg'), array('noP' => true, 'helps' => 'wpsg_mod_voucherproduct_bp')); ?>
 
@@ -116,7 +118,7 @@
 					</td>
 					<td>			
 						<label><input type="checkbox" value="1" name="text[<?php echo $i; ?>][aktiv]" <?php echo ((wpsg_isSizedInt($this->view['arTexte'][$i]['aktiv']))?'checked="checked"':''); ?> />&nbsp;<?php echo __("Aktiv", "wpsg"); ?></label>
-						<a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_pdfdownload_fieldconfig"></a>
+						<a style="float:right; position:relative;" class="glyphicon glyphicon-question-sign" data-wpsg-tip="mod_voucherproduct_fieldconfig" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_fieldconfig" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_voucherproduct_fieldconfig"></a>
 					</td>
 				</tr>
 				<tr>
diff --git a/views/mods/mod_wirecard/settings_edit.phtml b/views/mods/mod_wirecard/settings_edit.phtml
index 8e03bf0..2e25663 100644
--- a/views/mods/mod_wirecard/settings_edit.phtml
+++ b/views/mods/mod_wirecard/settings_edit.phtml
@@ -15,7 +15,7 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_wirecard_secret', __('Geheimer Schlüssel', 'wpsg'), $this->get_option('wpsg_mod_wirecard_secret'), array('help' => 'wpsg_mod_wirecard_secret')); ?>
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_wirecard_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_wirecard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
-<?php echo wpsg_drawForm_Select('wpsg_mod_wirecard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_wirecard_mwst'), array('help' => 'wpsg_mod_wirecard_mwst')); ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_wirecard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_wirecard_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_wirecard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_wirecard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_wirecard_currency', __('Währung', 'wpsg'), array(
-- 
cgit v1.2.3