- sync

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

21 files changed, 498 insertions, 649 deletions

diff --git a/views/admin/access.phtml b/views/admin/access.phtml
index 89af85d..4d3f970 100644
--- a/views/admin/access.phtml
+++ b/views/admin/access.phtml
@@ -7,89 +7,97 @@
 ?>

 <div class="wpsg_admin_submenu">

 	

-	<div class="head">

-		<div class="title"><?php echo __("Einstellungen", "wpsg"); ?></div>			

-		<div style="clear:both;"></div>

-	</div>

-

-	<ul>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		

-		<li class="<?php echo (($k == $this->view['subAction'])?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a></li>

+	<div class="list-group">

+		<span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>		

+		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		 

+		<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>		

 		<?php } ?>

-	</ul>

-			

+	</div> 

+	

 </div>

 		

-<div class="wpsg_admin_content">

+<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='.$_REQUEST['subaction'].'&noheader=1'); ?>">

 

 		<?php global $wpdb; $arRoles = get_option($wpdb->prefix."user_roles"); ?>

 

-		<table class="wpsg_access_table" cellpadding="0" cellspacing="0">

-			<tr>

-				<th class="wpsg_col_capname"></th>

-				<?php foreach ($arRoles as $role_key => $r) { ?>

-				<th class="wpsg_col_cap"><?php echo $r['name']; ?></th>

-				<?php } ?>

-				<th></th>

-			</tr>

-			<tr>

-				<td class="wpsg_col_capname"><?php echo __('Menüpunkt sichtbar', 'wpsg'); ?></td>

-				<?php foreach ($arRoles as $role_key => $r) { ?>

-				<td class="wpsg_col_cap">

-					<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_menu]" value="0" />

-					<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_menu']) && $r['capabilities']['wpsg_menu'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_menu]" value="1" /> 

-				</td>

-				<?php } ?>

-				<td></td>

-			</tr>

-			<tr>

-				<td class="wpsg_col_capname"><?php echo __('Konfiguration', 'wpsg'); ?></td>

-				<?php foreach ($arRoles as $role_key => $r) { ?>

-				<td class="wpsg_col_cap">

-					<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_conf]" value="0" />

-					<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_conf']) && $r['capabilities']['wpsg_conf'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_conf]" value="1" /> 

-				</td>

-				<?php } ?>

-				<td></td>

-			</tr>

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

-			<tr>

-				<td class="wpsg_col_capname"><?php echo __('Lizenzverwaltung', 'wpsg'); ?></td>

-				<?php foreach ($arRoles as $role_key => $r) { ?>

-				<td class="wpsg_col_cap">

-					<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_lizence]" value="0" />

-					<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_lizence']) && $r['capabilities']['wpsg_lizence'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_lizence]" value="1" /> 

-				</td>

-				<?php } ?>

-				<td></td>

-			</tr>	

-			<?php } ?>

-			<tr>

-				<td class="wpsg_col_capname"><?php echo __('Bestellverwaltung', 'wpsg'); ?></td>

-				<?php foreach ($arRoles as $role_key => $r) { ?>

-				<td class="wpsg_col_cap">

-					<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_order]" value="0" />

-					<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_order']) && $r['capabilities']['wpsg_order'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_order]" value="1" /> 

-				</td>

-				<?php } ?>

-				<td></td>

-			</tr>		

-			<tr>

-				<td class="wpsg_col_capname"><?php echo __('Produktverwaltung', 'wpsg'); ?></td>

-				<?php foreach ($arRoles as $role_key => $r) { ?>

-				<td class="wpsg_col_cap">

-					<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_produkt]" value="0" />

-					<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_produkt']) && $r['capabilities']['wpsg_produkt'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_produkt]" value="1" /> 

-				</td>

-				<?php } ?>

-				<td></td>

-			</tr>			

-			<?php $this->callMods('admin_setcapabilities'); ?>

-		</table>

+		<div class="panel panel-default">

+  			<div class="panel-heading clearfix">

+          		<h3 class="panel-title"><?php echo __('Berechtigungen', 'wpsg'); ?></h3>

+        	</div>

+  			<div class="panel-body">

+

+				<table class="wpsg_access_table table" cellpadding="0" cellspacing="0">

+					<thead>

+						<tr>

+							<th class="wpsg_col_capname"></th>

+							<?php foreach ($arRoles as $role_key => $r) { ?>

+							<th class="wpsg_col_cap"><?php echo $r['name']; ?></th>

+							<?php } ?>

+							<th></th>

+						</tr>

+					</thead>

+					<tbody>

+						<tr>

+							<td class="wpsg_col_capname"><?php echo __('Menüpunkt sichtbar', 'wpsg'); ?></td>

+							<?php foreach ($arRoles as $role_key => $r) { ?>

+							<td class="wpsg_col_cap">

+								<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_menu]" value="0" />

+								<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_menu']) && $r['capabilities']['wpsg_menu'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_menu]" value="1" /> 

+							</td>

+							<?php } ?>

+							<td></td>

+						</tr>

+						<tr>

+							<td class="wpsg_col_capname"><?php echo __('Konfiguration', 'wpsg'); ?></td>

+							<?php foreach ($arRoles as $role_key => $r) { ?>

+							<td class="wpsg_col_cap">

+								<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_conf]" value="0" />

+								<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_conf']) && $r['capabilities']['wpsg_conf'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_conf]" value="1" /> 

+							</td>

+							<?php } ?>

+							<td></td>

+						</tr>

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

+						<tr>

+							<td class="wpsg_col_capname"><?php echo __('Lizenzverwaltung', 'wpsg'); ?></td>

+							<?php foreach ($arRoles as $role_key => $r) { ?>

+							<td class="wpsg_col_cap">

+								<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_lizence]" value="0" />

+								<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_lizence']) && $r['capabilities']['wpsg_lizence'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_lizence]" value="1" /> 

+							</td>

+							<?php } ?>

+							<td></td>

+						</tr>	

+						<?php } ?>

+						<tr>

+							<td class="wpsg_col_capname"><?php echo __('Bestellverwaltung', 'wpsg'); ?></td>

+							<?php foreach ($arRoles as $role_key => $r) { ?>

+							<td class="wpsg_col_cap">

+								<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_order]" value="0" />

+								<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_order']) && $r['capabilities']['wpsg_order'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_order]" value="1" /> 

+							</td>

+							<?php } ?>

+							<td></td>

+						</tr>		

+						<tr>

+							<td class="wpsg_col_capname"><?php echo __('Produktverwaltung', 'wpsg'); ?></td>

+							<?php foreach ($arRoles as $role_key => $r) { ?>

+							<td class="wpsg_col_cap">

+								<input type="hidden" name="wpsg_cap[<?php echo $role_key; ?>][wpsg_produkt]" value="0" />

+								<input type="checkbox" <?php echo ((isset($r['capabilities']['wpsg_produkt']) && $r['capabilities']['wpsg_produkt'] == "1")?'checked="checked"':''); ?> name="wpsg_cap[<?php echo $role_key; ?>][wpsg_produkt]" value="1" /> 

+							</td>

+							<?php } ?>

+							<td></td>

+						</tr>			

+						<?php $this->callMods('admin_setcapabilities'); ?>

+					</tbody>

+				</table>

+			

+			</div>

+		</div>

 		

-		<br />

-		<input type="submit" value="<?php echo __('Berechtigungen Speichern', 'wpsg'); ?>" name="submit" id="submit" class="button-primary" />		

+		<p class="submit"><input type="submit" value="<?php echo __('Berechtigungen Speichern', 'wpsg'); ?>" name="submit" id="submit" class="button-primary" /></p>		

   

   	</form>

 </div>
\ No newline at end of file
diff --git a/views/admin/customerpreset.phtml b/views/admin/customerpreset.phtml
deleted file mode 100644
index 128c2ac..0000000
--- a/views/admin/customerpreset.phtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php

-

-	/**

-	 * Template für die Kundenvoreinstellungen im Backend

-	 */

-

-?>

-<div class="wpsg_admin_submenu">

-	

-	<div class="head">

-		<div class="title"><?php echo __("Einstellungen", "wpsg"); ?></div>			

-		<div style="clear:both;"></div>

-	</div>

-

-	<ul>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		

-		<li class="<?php echo (($k == $this->view['subAction'])?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a></li>

-		<?php } ?>

-	</ul>

-			

-</div>

-

-<div class="wpsg_admin_content">

-	

-	<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'), 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( '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 

-		)); ?>

-		

-		<br />

-				

-		<input class="button-primary" type="submit" name="wpsg-submit" value="<?php echo __('Speichern', 'wpsg'); ?>" />

-	

-	</form>

-	

-</div>
\ No newline at end of file
diff --git a/views/admin/extended.phtml b/views/admin/extended.phtml
index d97320b..6a6527c 100644
--- a/views/admin/extended.phtml
+++ b/views/admin/extended.phtml
@@ -7,54 +7,49 @@
 ?>

 <div class="wpsg_admin_submenu">

 	

-	<div class="head">

-		<div class="title"><?php echo __("Einstellungen", "wpsg"); ?></div>			

-		<div style="clear:both;"></div>

-	</div>

-

-	<ul>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		

-		<li class="<?php echo (($k == $this->view['subAction'])?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a></li>

+	<div class="list-group">

+		<span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>		

+		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		 

+		<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>		

 		<?php } ?>

-	</ul>

-			

+	</div> 

+	

 </div>

 		

-<div style="padding:0px; margin:0px; float:left;">

+<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=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'), 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'), array('help' => 'wpsg_debugURL')); ?>				

-		<?php } ?>

-		

-		<?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'), 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_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'), 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">

-

-			jQuery(document).ready(function() {

- 

-				jQuery('.wpsg_form_help').tipTip();

+		<div class="panel panel-default">

+  			<div class="panel-heading clearfix">

+          		<h3 class="panel-title"><?php echo __('Erweiterte Einstellungen', 'wpsg'); ?></h3>

+        	</div>

+  			<div class="panel-body">

+	

+				<?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'), array('help' => 'wpsg_options_nl2br')); ?>

+				<?php echo wpsg_drawForm_Checkbox('wpsg_debugModus', __('Debug Modus', 'wpsg'), $this->get_option('wpsg_debugModus'), array('help' => 'wpsg_debugModus')); ?>

 				

-			} );

-		

-		</script>

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

+				<?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'), 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'), 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_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'), 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')); ?>

+							

+			</div>

+		</div>

 		

 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 	

diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml
index c183513..e20ddea 100644
--- a/views/admin/form/checkbox.phtml
+++ b/views/admin/form/checkbox.phtml
@@ -1,14 +1,26 @@
-<div class="form-group form-group-sm form-checkbox">

+<div class="form-group form-group-sm form-checkbox <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?>">

 

-	<div class="col-sm-offset-6 col-sm-6">

+	<div class="<?php 

+	

+		if (wpsg_isTrue($this->view['field_config']['fullWidth'])) echo 'col-sm-12';

+		else echo 'col-sm-offset-6 col-sm-6';

+		

+	?>">

 		

 		<div class="checkbox">

 			<label>

 			

-				<input type="hidden" name="<?php echo $this->view['field_name']; ?>" value="0" />

-				<input type="checkbox" name="<?php echo $this->view['field_name']; ?>" value="1" <?php echo (($this->view['field_checked'] > 0)?'checked="checked"':''); ?> />

+				<div class="wpsg_field_wrap">

+					<input type="hidden" name="<?php echo $this->view['field_name']; ?>" value="0" />

+					<input type="checkbox" id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>" value="1" <?php echo (($this->view['field_checked'] > 0)?'checked="checked"':''); ?> />

 				

-				<?php echo $this->view['field_label']; ?>

+					<?php echo $this->view['field_label']; ?>

+					

+					<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

+						<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+					<?php } ?>

+					

+				</div>

 				

 			</label>

 		</div>

diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index 1235fc7..d4870d2 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -1,4 +1,4 @@
-<div class="form-group form-group-sm has-feedback">

+<div class="form-group form-group-sm <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?>">

 

 	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>

 	

diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml
index 480f333..ab46b8a 100644
--- a/views/admin/form/select.phtml
+++ b/views/admin/form/select.phtml
@@ -1,14 +1,22 @@
-<div class="form-group form-group-sm">

+<div class="form-group form-group-sm form-select <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?>">

 

 	<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']; ?>" class="form-control input-sm" <?php echo $this->view['atts_select']; ?>>

-			<?php foreach ($this->view['field_values'] as $k => $v) { ?>

-			<option <?php echo (($k == $this->view['field_value'])?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($k); ?>"><?php echo wpsg_hspc($v); ?></option>

+		<div class="wpsg_field_wrap">

+		

+			<select id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>" class="form-control input-sm" <?php echo $this->view['atts_select']; ?>>

+				<?php foreach ($this->view['field_values'] as $k => $v) { ?>

+				<option <?php echo (($k == $this->view['field_value'])?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($k); ?>"><?php echo wpsg_hspc($v); ?></option>

+				<?php } ?>

+			</select>

+			

+			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

 			<?php } ?>

-		</select>

+			

+		</div>

 	

 	</div>

 	

diff --git a/views/admin/form/textarea.phtml b/views/admin/form/textarea.phtml
new file mode 100644
index 0000000..fabe0de
--- /dev/null
+++ b/views/admin/form/textarea.phtml
@@ -0,0 +1,20 @@
+<div class="form-group form-group-sm form-textarea <?php echo ((wpsg_isSizedString($this->view['field_config']['help']))?'has-feedback':''); ?>">

+

+	<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">

+	

+		<div class="wpsg_field_wrap">

+			

+			<textarea class="form-control" id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>"><?php echo wpsg_hspc($this->view['field_value']); ?></textarea>

+			

+			<?php if (wpsg_isSizedString($this->view['field_config']['help'])) { ?>

+				<a href="#" data-wpsg-tip="<?php echo $this->view['field_config']['help']; ?>" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=<?php echo $this->view['field_config']['help']; ?>" class="glyphicon glyphicon glyphicon-info-sign form-control-feedback" aria-hidden="true"></a>

+			<?php } ?>

+		</div>

+				

+	</div>

+	

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

+	

+</div>
\ No newline at end of file
diff --git a/views/admin/includes.phtml b/views/admin/includes.phtml
index 8f085cf..ab6da2d 100644
--- a/views/admin/includes.phtml
+++ b/views/admin/includes.phtml
@@ -38,13 +38,3 @@
 		

 	</form>

 </div>

-

-<script type="text/javascript">

-

-	jQuery(document).ready(function() {

-		

-		jQuery('.wpsg_form_help').tipTip();

-		

-	} );

-

-</script>
\ No newline at end of file
diff --git a/views/admin/index.phtml b/views/admin/index.phtml
index 0b7e1aa..c6f7b0a 100644
--- a/views/admin/index.phtml
+++ b/views/admin/index.phtml
@@ -46,52 +46,4 @@
 		<?php } ?>

 	</div>

 	

-</div>

-

-<script type="text/javascript">/* <![CDATA[ */

-

-	jQuery(document).ready(function() {

-

-		jQuery('*[data-wpsg-tip]').bind('click', function() { 

-

-			jQuery(this).unbind('click');

-

-			var po = this;

-			

-			jQuery(this).popover( {

-				'html': true,

-				'content': function(el) {

-

-					if (this.cache) return this.cache

-					 

-					jQuery.ajax( {

-						url: '?page=wpsg-Admin&subaction=loadHelp&noheader=1',

-						data: {

-							field: jQuery(this).attr('data-wpsg-tip')

-						},

-						success: function(data) {

-

-							var popover = jQuery(po).attr('data-content', data).data('popover');

-							jQuery(po).data('bs.popover').options.content = data;

-							

-							//popover.setContent();

-							

-							//jQuery('#wpsg-popover-content').html(data);

-							//jQuery(po).setContent();

-							

-						}

-					} );

-					

-					return this.cache = '<div id="wpsg-popover-content"><img src="' + wpsg_ajax.img_ajaxloading + '" alt="' + wpsg_ajax.label_pleasewait + '" /></div>';

-										

-				},

-				'trigger': 'focus'

-			} ).popover('show');

- 

-			return false;

-			

-		} );

-		

-	} );

-

-/* ]]> */</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/views/admin/kalkulation.phtml b/views/admin/kalkulation.phtml
index e41888a..a6019b3 100644
--- a/views/admin/kalkulation.phtml
+++ b/views/admin/kalkulation.phtml
@@ -7,85 +7,64 @@
 ?>

 <div class="wpsg_admin_submenu">

 	

-	<div class="head">

-		<div class="title"><?php echo __("Einstellungen", "wpsg"); ?></div>			

-		<div style="clear:both;"></div>

-	</div>

-

-	<ul>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		

-		<li class="<?php echo (($k == $this->view['subAction'])?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a></li>

+	<div class="list-group">

+		<span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>		

+		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		 

+		<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>		

 		<?php } ?>

-	</ul>

+	</div> 

 			

 </div>

 

-<div style="padding:0px; margin:0px; float:left;">		

+<div class="wpsg_admin_content form-horizontal">

 	<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_kleinunternehmer', __('Kleinunternehmerregelung', 'wpsg'), $this->get_option('wpsg_kleinunternehmer'), array('help' => 'Preiskalkulation_wpsg_kleinunternehmer')); ?>

-		<?php echo wpsg_drawForm_Textarea('wpsg_kleinunternehmer_text', __('Kleinunternehmerregelung Text', 'wpsg'), $this->get_option('wpsg_kleinunternehmer_text'), array()) ?>

-		<div class="wpsg_preisangaben_layer">

-			<div class="wpsg_form_field">

-				<div class="wpsg_form_left">

-					<?php echo __("Preisangaben im Shop (Backend)", "wpsg"); ?>:

-				</div>

-				<div class="wpsg_form_right">

-					<select name="wpsg_preisangaben">

-						<option value="<?php echo WPSG_BRUTTO; ?>" <?php echo (($this->get_option('wpsg_preisangaben') == WPSG_BRUTTO)?'selected="selected"':''); ?>><?php echo __('Brutto (inkl. Steuer)', 'wpsg'); ?></option>

-						<option value="<?php echo WPSG_NETTO; ?>" <?php echo (($this->get_option('wpsg_preisangaben') == WPSG_NETTO)?'selected="selected"':''); ?>><?php echo __('Netto (zzgl. Steuer)', 'wpsg'); ?></option>

-					</select>

+	

+		<div class="panel panel-default">

+  			<div class="panel-heading clearfix">

+          		<h3 class="panel-title"><?php echo __('Preiskalkulation', 'wpsg'); ?></h3>

+        	</div>

+  			<div class="panel-body">

+	

+				<?php echo wpsg_drawForm_Checkbox('wpsg_hideemptyshipping', __('Versandkosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptyshipping'), array('help' => 'Preiskalkulation_wpsg_hideemptyshipping')); ?>

+				<?php echo wpsg_drawForm_Checkbox('wpsg_hideemptypayment', __('Zahlungskosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptypayment'), array('help' => 'Preiskalkulation_wpsg_hideemptypayment')); ?>

+	

+				<?php echo wpsg_drawForm_Checkbox('wpsg_kleinunternehmer', __('Kleinunternehmerregelung', 'wpsg'), $this->get_option('wpsg_kleinunternehmer'), array('help' => 'Preiskalkulation_wpsg_kleinunternehmer')); ?>

+				

+				<div class="wpsg_kleinunternehmer_layer wpsg_kleinunternehmer_layer_1">

+					<?php echo wpsg_drawForm_Textarea('wpsg_kleinunternehmer_text', __('Kleinunternehmerregelung Text', 'wpsg'), $this->get_option('wpsg_kleinunternehmer_text'), array()) ?>

 				</div>

-				<div class="wpsg_clear"></div>

+				

+				<div class="wpsg_kleinunternehmer_layer wpsg_kleinunternehmer_layer_0">

+					<?php echo wpsg_drawForm_Select('wpsg_preisangaben', __('Preisangaben im Shop (Backend)', 'wpsg'), array(

+						WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg'),

+						WPSG_BRUTTO => __('Brutto (inkl. Steuer)', 'wpsg')

+					), $this->get_option('wpsg_preisangaben')); ?>				

+					<?php echo wpsg_drawForm_Select('wpsg_preisangaben_frontend', __('Preisangaben im Shop (Frontend)', 'wpsg'), array(WPSG_BRUTTO => __('Brutto (inkl. Steuer)', 'wpsg'), WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg')), $this->get_option('wpsg_preisangaben_frontend')); ?>					

+				</div>			

+								

 			</div>

-			<?php echo wpsg_drawForm_Select('wpsg_preisangaben_frontend', __('Preisangaben im Shop (Frontend)', 'wpsg'), array(WPSG_BRUTTO => __('Brutto (inkl. Steuer)', 'wpsg'), WPSG_NETTO => __('Netto (zzgl. Steuer)', 'wpsg')), $this->get_option('wpsg_preisangaben_frontend')); ?>

-		</div>			

-			

-		<?php echo wpsg_drawForm_Checkbox('wpsg_hideemptyshipping', __('Versandkosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptyshipping'), array('help' => 'Preiskalkulation_wpsg_hideemptyshipping')); ?>

-		<?php echo wpsg_drawForm_Checkbox('wpsg_hideemptypayment', __('Zahlungskosten bei 0 ausblenden', 'wpsg'), $this->get_option('wpsg_hideemptypayment'), array('help' => 'Preiskalkulation_wpsg_hideemptypayment')); ?>

-		

+		</div>

+				

 		<input type="hidden" name="subaction" value="kalkulation" />

 			

 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 		

-		<script type="text/javascript">

-

-			/**

-			 * Wird beim ändern der Kleinunternehmerregelung aufgerufen

-			 */

-			function wpsg_setKleinunternehmer()

-			{

-

-				return;

-				

-				if (jQuery('#wpsg_kleinunternehmer').attr('checked'))

-				{

-

-					jQuery('.wpsg_preisangaben_layer').hide();

-					

-				}

-				else

-				{

-

-					jQuery('.wpsg_preisangaben_layer').show();

-					

-				}

-				

-			} // function wpsg_setKleinunternehmer()

-		

+		<script type="text/javascript">/* <![CDATA[ */

+ 

 			jQuery(document).ready(function() {

 

 				jQuery('#wpsg_kleinunternehmer').bind('change', function() {

 

-					wpsg_setKleinunternehmer();

+					jQuery('.wpsg_kleinunternehmer_layer').hide();

+					 

+					if (jQuery(this).prop('checked')) jQuery('.wpsg_kleinunternehmer_layer_1').show();

+					else jQuery('.wpsg_kleinunternehmer_layer_0').show();

 					

-				} );

-				

-				jQuery('.wpsg_form_help').tipTip();

-				wpsg_setKleinunternehmer();

+				} ).change();

 				

 			} );

 		

-		</script>

+		/* ]]> */</script>

 			

 	</form>

 </div>
\ No newline at end of file
diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml
index 38a3a8a..42f1231 100644
--- a/views/admin/konfiguration.phtml
+++ b/views/admin/konfiguration.phtml
@@ -107,8 +107,7 @@
 					'1' => __('Zum Warenkorb leiten', 'wpsg'),

 					'2' => __('Warenkorb im Fenster anzeigen', 'wpsg'),

 					'3' => __('Lightbox Meldung', 'wpsg')

-				), $this->get_option('wpsg_afterinsert')); ?>

-				<?php echo wpsg_drawForm_Checkbox('wpsg_skip_checkout2', __('Auswahl der Zahlung/Versandart überspringen wenn möglich', 'wpsg'), $this->get_option('wpsg_skip_checkout2')); ?>

+				), $this->get_option('wpsg_afterinsert')); ?>			

 				<?php echo wpsg_drawForm_Select('wpsg_afterorder', __('Kundendaten nach Bestellung', 'wpsg'), array(

 					'0' => __('In Session belassen', 'wpsg'),

 					'1' => __('Löschen', 'wpsg')

@@ -118,18 +117,9 @@
 				<?php echo wpsg_drawForm_Input('wpsg_customer_start', __('Start für Kundennummer', 'wpsg'), $this->get_option('wpsg_customer_start')); ?>		

 				<?php echo wpsg_drawForm_Input('wpsg_format_onr', __('Formatierung Bestellnummer', 'wpsg'), $this->get_option('wpsg_format_onr'), array('help' => 'Formatierung_Bestellnummer')); ?>

 				<?php echo wpsg_drawForm_Input('wpsg_order_start', __('Start für Bestellnummer', 'wpsg'), $this->get_option('wpsg_order_start')); ?>

+				<?php echo wpsg_drawForm_Checkbox('wpsg_skip_checkout2', __('Auswahl der Zahlung/Versandart überspringen wenn möglich', 'wpsg'), $this->get_option('wpsg_skip_checkout2')); ?>

 			</div>

-		</div>	

-				

-		<script type="text/javascript">/* <![CDATA[ */

-

-			jQuery(document).ready(function() {

- 

-				jQuery('.wpsg_form_help').tipTip();

-				

-			} );

-		

-			/* ]]> */</script>

+		</div>	 

 		

 		<input type="hidden" name="subaction" value="konfiguration" />

 			

diff --git a/views/admin/kundendaten.phtml b/views/admin/kundendaten.phtml
index 6896577..4c65f1d 100644
--- a/views/admin/kundendaten.phtml
+++ b/views/admin/kundendaten.phtml
@@ -5,84 +5,138 @@
 	 */

 

 ?>

+

 <div class="wpsg_admin_submenu">

 	

-	<div class="head">

-		<div class="title"><?php echo __("Einstellungen", "wpsg"); ?></div>			

-		<div style="clear:both;"></div>

-	</div>

-

-	<ul>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		

-		<li class="<?php echo (($k == $this->view['subAction'])?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a></li>

+	<div class="list-group">

+		<span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>		

+		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		 

+		<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>		

 		<?php } ?>

-	</ul>

-			

+	</div> 

+	

 </div>

 

-<div class="wpsg_admin_content">

-	<div class="wpsg_admin_box" id="wpsg_tab">		

-			

-		<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']; ?>">

-		  		

-			<div class="head">

-				<div class="title">

-					<div class="tab" id="tab1"><?php echo __('Pfllichtfelder', 'wpsg'); ?></div>

-					<div class="tab" id="tab2"><?php echo __('Weitere Kundendaten', 'wpsg'); ?></div>

-					<div class="tabcontent tablink">

-						<a href="" title="<?php echo __('Neues Kundenfeld hinzufügen', 'wpsg'); ?>" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_addCustomField();"></a>

+<!-- Modal -->

+<div class="modal fade" id="wpsg_code_dialog" tabindex="-1" role="dialog">

+  <div class="modal-dialog" role="document">

+    <div class="modal-content">

+      <div class="modal-header">

+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>

+        <h4 class="modal-title" id="myModalLabel"><?php echo __('HTML Code Block', 'wpsg'); ?></h4>

+      </div>

+      <div class="modal-body">

+        

+      </div>

+      <div class="modal-footer">

+        <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo __('Schließen', 'wpsg'); ?></button> 

+      </div>

+    </div>

+  </div>

+</div>

+

+<div class="wpsg_admin_content form-horizontal wpsg_customerfield">

+

+	<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']; ?>">

+	

+		<div class="panel panel-default">

+			<div class="panel-heading clearfix">

+	       		<h3 class="panel-title"><?php echo __('Kundendaten', 'wpsg'); ?></h3>

+	       	</div>

+			<div class="panel-body">

+	

+				<ul class="nav nav-tabs" role="tablist">

+					<li role="presentation" class="active"><a href="#tabcontent1" role="tab" aria-controls="tabcontent1" data-toggle="tab"><?php echo __('Pfllichtfelder', 'wpsg'); ?></a></li>

+					<li role="presentation" class=""><a href="#tabcontent2" role="tab" aria-controls="tabcontent2" data-toggle="tab"><?php echo __('Weitere Kundendaten', 'wpsg'); ?></a></li>

+					<li role="presentation" class=""><a href="#tabcontent3" role="tab" aria-controls="tabcontent3" data-toggle="tab"><?php echo __('Kundenvoreinstellungen', 'wpsg'); ?></a></li>

+				</ul>

+						 

+				<div class="tab-content">

+					<div role="tabpanel" id="tabcontent1" class="tab-pane active">

+						<?php echo $this->render(WPSG_PATH_VIEW.'/admin/kundendaten_tab1.phtml'); ?>

+					</div>

+					<div role="tabpanel" id="tabcontent2" class="tab-pane">

+						<?php echo $this->render(WPSG_PATH_VIEW.'/admin/kundendaten_tab2.phtml'); ?>

+					</div>

+					<div role="tabpanel" id="tabcontent3" class="tab-pane">

+						<?php echo $this->render(WPSG_PATH_VIEW.'/admin/kundendaten_tab3.phtml'); ?>

 					</div>

-					<div class="wpsg_clear"></div>

-				</div>

-			</div>

-			<div class="content" id="wpsg_mwst_list">

-				

-				<div id="tabcontent1" class="tabcontent">

-					<?php echo $this->render(WPSG_PATH_VIEW.'/admin/kundendaten_tab1.phtml'); ?>

-				</div>

-				<div id="tabcontent2" class="tabcontent">

-					

-					<?php echo $this->render(WPSG_PATH_VIEW.'/admin/kundendaten_tab2.phtml'); ?>

-					

 				</div>

-				

+	

 			</div>

+		</div>

+		

+		<p calss="submit"><input type="submit" value="<?php echo __('Einstellungen Speichern', 'wpsg'); ?>" class="button-primary" /></p>

+		

+	</form>

+	

+	<script type="text/javascript">/* <![CDATA[ */

+

+		/**

+		 * Fügt ein neues Feld in die Liste der Kundenvariablen ein und lädt die Liste neu

+		 */	                                            	

+		function wpsg_addCustomField()

+		{

+	

+			jQuery('#tabcontent2').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

 			

-			<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

+			jQuery.ajax( {

+				url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten&do=add&noheader=1',

+				success: function(data) {

+					jQuery('#tabcontent2').html(data);

+				}

+			} );

+	

+			return false;

 			

-		</form>

-				

-		<script type="text/javascript">

+		} // function wpsg_addCustomField()

+

+		/**

+		 * Löscht eine Kundenvariable und entfernt die Zeile aus der Liste

+		 */

+		function wpsg_removeCustomField(kv_index)

+		{

 

-			/**

-			 * Wird beim hinzufügen eines benutzerdefinierten Kundenfeldes aufgerufen

-			 */

-			function wpsg_addCustomField()

-			{

+			if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false;

+			

+			jQuery('.wpsg_customervar_row_' + kv_index).hide(250, function() { jQuery(this).remove(); } );

 

-				jQuery('#tabcontent2').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

-				

-				jQuery.ajax( {

-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten&do=add&noheader=1',

-					success: function(data) {

-						jQuery('#tabcontent2').html(data);

-					}

-				} );

+			jQuery.ajax( {

+				url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten&do=remove&noheader=1',

+				data: {

+					'kv_index': kv_index

+				},

+				success: function(data) { 

 

-				return false;

-				

-			} // function wpsg_addCustomField()

-		

-			jQuery(document).ready(function() {

-				jQuery('#wpsg_tab').wpsg_tab( { 

-					'cookiename': 'wpsg_kundendaten_tab',

-					'tab2': function() {

-						jQuery('.tablink').show();

-					}

-				} );

+					if (data != "1") alert(data); 

+

+				}

 			} );

+

+			return false;

+			

+		} // function wpsg_removeCustomField(kv_index)

 		

-		</script>

-				

-	</div>

+		/**

+		 * Zeigt den HTML Code, der die gewählte Kundenvariablen in die Templates einbaut

+		 */

+		function wpsg_genKVCode(kv_index)

+		{

+

+			jQuery('#wpsg_code_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

+			

+			jQuery('#wpsg_code_dialog').modal( { } )

+			

+			jQuery.ajax( {

+    			url: 'admin.php?page=wpsg-Admin&subaction=kundendaten&noheader=1&show=code',

+    			data: { 'kv_id': kv_index },

+    			success: function(data) { jQuery('#wpsg_code_dialog .modal-body').html(data); }

+        	} );

+			 

+			return false;

+			

+		} // function wpsg_genPACode(pa_id)

+	    

+	/* ]]> */</script>

+

 </div>
\ No newline at end of file
diff --git a/views/admin/kundendaten_tab1.phtml b/views/admin/kundendaten_tab1.phtml
index 6fe5425..d619bdc 100644
--- a/views/admin/kundendaten_tab1.phtml
+++ b/views/admin/kundendaten_tab1.phtml
@@ -4,143 +4,26 @@
 	 * Template für den ersten Karteireiter der Kundendaten

 	 */

 

+	$arSelect = array(

+		'0' => __('Ja', 'wpsg'),

+		'1' => __('Nein', 'wpsg')

+	);

+

 ?>

-<table class="wpsg_pflichtfelder">

-	<tr>

-		<th class="col0"><?php echo __("Feldbezeichnung", "wpsg"); ?></th>

-		<th class="col1"><?php echo __("Pflichtfeld", "wpsg"); ?></th>	 

-	</tr>

-	<tr class="wpsg_odd">

-		<td class="col0"><?php echo __('Anrede', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[anrede]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['anrede'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>

-			</select>

-		</td>

-	</tr>

-	<tr class="wpsg_odd">

-		<td class="col0"><?php echo __('Mögliche Werte für Auswahl getrennt mit |', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<input type="text" style="width:100%;" name="pflicht[anrede_auswahl]" value="<?php echo $this->view['pflicht']['anrede_auswahl']; ?>" />

-		</td>

-	</tr>

-	<tr class="wpsg_even">

-		<td class="col0"><?php echo __('Firma', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[firma]">

-				<option value="0"><?php echo __("Ja", "wpsg"); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['firma'] == '1')?'selected="selected"':''); ?>><?php echo __("Nein", "wpsg"); ?></option>														

-			</select>

-		</td> 

-	</tr>

-	<tr class="wpsg_odd">

-		<td class="col0"><?php echo __('Vorname', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[vname]">

-				<option value="0"><?php echo __("Ja", "wpsg"); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['vname'] == '1')?'selected="selected"':''); ?>><?php echo __("Nein", "wpsg"); ?></option>							

-			</select>

-		</td> 

-	</tr>

-	<tr class="wpsg_even">

-		<td class="col0"><?php echo __('Name', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[name]">

-				<option value="0"><?php echo __("Ja", "wpsg"); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['name'] == '1')?'selected="selected"':''); ?>><?php echo __("Nein", "wpsg"); ?></option>							

-			</select>

-		</td>

-	</tr>	

-	<tr class="wpsg_odd">

-		<td class="col0"><?php echo __('Geburtsdatum', 'wpsg'); ?></td>

-		<td class="col1">

-			<select name="pflicht[geb]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['geb'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>							

-			</select>

-		</td> 

-	</tr>

-	<tr class="wpsg_even">

-		<td class="col0"><?php echo __('E-Mail Adresse', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[email]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['email'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>							

-			</select>

-		</td>

-	</tr>

-	<tr class="wpsg_even">

-		<td class="col0"></td>

-		<td class="col1">

-			<label style="line-height:24px;">

-				<input type="hidden" name="pflicht[emailconfirm]" value="0" />

-				<input type="checkbox" value="1" <?php echo (($this->view['pflicht']['emailconfirm'] == '1')?'checked="checked"':''); ?> name="pflicht[emailconfirm]" style="width:auto; margin-left:5px;" />&nbsp;

-				<?php echo __('E-Mail Adresse (Wiederholung)', 'wpsg'); ?>

-			</label>

-		</td>

-	</tr>

-	<tr class="wpsg_odd">

-		<td class="col0"><?php echo __('Telefon', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[tel]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['tel'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>							

-			</select>

-		</td> 

-	</tr>

-	<tr class="wpsg_even">

-		<td class="col0"><?php echo __('Fax', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[fax]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['fax'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>							

-			</select>

-		</td> 

-	</tr>

-	<tr class="wpsg_odd">

-		<td class="col0"><?php echo __('Straße', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[strasse]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['strasse'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>							

-			</select>

-		</td> 

-	</tr>

-	<tr class="wpsg_even">

-		<td class="col0"><?php echo __('Postleitzahl', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[plz]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['plz'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>							

-			</select>

-		</td> 

-	</tr>			 	

-	<tr class="wpsg_odd">

-		<td class="col0"><?php echo __('Ort', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[ort]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['ort'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>							

-			</select>

-		</td>

-	</tr>

-	<tr class="wpsg_even">

-		<td class="col0"><?php echo __('Land', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[land]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['land'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>							

-			</select>

-		</td> 

-	</tr>			 	

-	<tr class="wpsg_odd">

-		<td class="col0"><?php echo __('UStIdNr.', 'wpsg'); ?>:</td>

-		<td class="col1">

-			<select name="pflicht[ustidnr]">

-				<option value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option value="1" <?php echo (($this->view['pflicht']['ustidnr'] == '1')?'selected="selected"':''); ?>><?php echo __('Nein', 'wpsg'); ?></option>							

-			</select>

-		</td>

-	</tr>

-</table>

+

+<?php echo wpsg_drawForm_Select('pflicht[anrede]', __('Anrede', 'wpsg'), $arSelect, $this->view['pflicht']['anrede']); ?>

+<?php echo wpsg_drawForm_Input('pflicht[anrede_auswahl]', __('Mögliche Werte für Auswahl getrennt mit |', 'wpsg'), $this->view['pflicht']['anrede_auswahl']); ?>

+<?php echo wpsg_drawForm_Select('pflicht[firma]', __('Firma', 'wpsg'), $arSelect, $this->view['pflicht']['firma'])?>

+<?php echo wpsg_drawForm_Select('pflicht[vname]', __('Vorname', 'wpsg'), $arSelect, $this->view['pflicht']['vname'])?>

+<?php echo wpsg_drawForm_Select('pflicht[name]', __('Name', 'wpsg'), $arSelect, $this->view['pflicht']['name'])?>

+<?php echo wpsg_drawForm_Select('pflicht[geb]', __('Geburtsdatum', 'wpsg'), $arSelect, $this->view['pflicht']['geb'])?>

+<?php echo wpsg_drawForm_Select('pflicht[email]', __('E-Mail Adresse', 'wpsg'), $arSelect, $this->view['pflicht']['email'])?>

+<?php echo wpsg_drawForm_Checkbox('pflicht[emailconfirm]', __('E-Mail Adresse (Wiederholung)', 'wpsg'), $this->view['pflicht']['emailconfirm']); ?>

+<?php echo wpsg_drawForm_Select('pflicht[tel]', __('Telefon', 'wpsg'), $arSelect, $this->view['pflicht']['tel'])?>

+<?php echo wpsg_drawForm_Select('pflicht[fax]', __('Fax', 'wpsg'), $arSelect, $this->view['pflicht']['fax'])?>

+<?php echo wpsg_drawForm_Select('pflicht[strasse]', __('Straße', 'wpsg'), $arSelect, $this->view['pflicht']['strasse'])?>

+<?php echo wpsg_drawForm_Select('pflicht[plz]', __('Postleitzahl', 'wpsg'), $arSelect, $this->view['pflicht']['plz'])?>

+<?php echo wpsg_drawForm_Select('pflicht[ort]', __('Ort', 'wpsg'), $arSelect, $this->view['pflicht']['ort'])?>

+<?php echo wpsg_drawForm_Select('pflicht[land]', __('Land', 'wpsg'), $arSelect, $this->view['pflicht']['land'])?>

+<?php echo wpsg_drawForm_Select('pflicht[ustidnr]', __('UStIdNr.', 'wpsg'), $arSelect, $this->view['pflicht']['ustidnr'])?>

+ 

diff --git a/views/admin/kundendaten_tab2.phtml b/views/admin/kundendaten_tab2.phtml
index e506f2e..b6073a5 100644
--- a/views/admin/kundendaten_tab2.phtml
+++ b/views/admin/kundendaten_tab2.phtml
@@ -5,9 +5,80 @@
 	 */

 

 ?>

+

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

+<div id="wpsg_kv_code_dialog" style="display:none;"><div class="wpsg_dialog"></div></div>

+

+<table class="wpsg_customfields table">

+	<thead>			

+		<tr>

+			<th class="col0"><?php echo __('Index', 'wpsg'); ?></th>		

+			<th class="col1"><?php echo __('Kundenvariablen', 'wpsg'); ?></th>

+			<th class="col2"><?php echo __('Pflichtfeld', 'wpsg'); ?></th>

+			<th class="col3"><?php echo __('Typ', 'wpsg'); ?></th>

+			<th class="col4"></th>

+			<th class="col5">

+				<a href="#" title="<?php echo __('Neue Kundenvariable anlegen', 'wpsg'); ?>" onclick="return wpsg_addCustomField();" class="customer_variable_add"><span class="glyphicon glyphicon-plus"></span></a>	

+			</th>

+		</tr>

+	</thead>

+	<tbody>

+		<?php foreach ($this->view['pflicht']['custom'] as $c_id => $c) { ?>	

+		<tr class="wpsg_customervar_row_<?php echo $c_id; ?>">

+			<td class="col0"><?php echo $c_id; ?></td>

+			<td class="col2"><span class="wpsg_editable" id="kundenvariable_name_<?php echo $c_id; ?>"><?php echo wpsg_hspc($c['name']); ?></span></td>

+			<td class="col3">

+				<select class="form-control wpsg-sm" name="pflicht[custom][<?php echo $c_id; ?>][show]">

+					<option <?php echo (($c['show'] == '0')?'selected="selected"':''); ?> value="0"><?php echo __('Ja', 'wpsg'); ?></option>

+					<option <?php echo (($c['show'] == '1')?'selected="selected"':''); ?> value="1"><?php echo __('Nein', 'wpsg'); ?></option>

+					<option <?php echo (($c['show'] == '2')?'selected="selected"':''); ?> value="2"><?php echo __('Nicht zeigen', 'wpsg'); ?></option>

+				</select>

+			</td>

+			<td class="col3">

+				<select class="form-control wpsg-sm" onchange="if (jQuery(this).val() == '1') jQuery('#row_auswahl_<?php echo $c_id; ?>').show(); else jQuery('#row_auswahl_<?php echo $c_id; ?>').hide();" name="pflicht[custom][<?php echo $c_id; ?>][typ]">

+					<option <?php echo (($c['typ'] == '0')?'selected="selected"':''); ?> value="0"><?php echo __('Textfeld', 'wpsg'); ?></option>

+					<option <?php echo (($c['typ'] == '1')?'selected="selected"':''); ?> value="1"><?php echo __('Auswahlfeld', 'wpsg'); ?></option>

+					<option <?php echo (($c['typ'] == '2')?'selected="selected"':''); ?> value="2"><?php echo __('Checkbox', 'wpsg'); ?></option>

+				</select>

+			</td>

+			<td class="col4">				

+				<a href="#" title="<?php echo __('HTML Code generieren', 'wpsg'); ?>" onclick="return wpsg_genKVCode(<?php echo $c_id; ?>);"><span class="glyphicon glyphicon-modal-window"></span></a>

+			</td>

+			<td class="col5">

+			

+				<a href="#" title="<?php echo __('Kundenvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removeCustomField(<?php echo $c_id; ?>);"><span class="glyphicon glyphicon-trash"></span></a>

+				

+				<script type="text/javascript">

+

+					jQuery('#kundenvariable_name_<?php echo $c_id; ?>').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten&do=inlinedit&noheader=1', {

+						submitdata: { 

+				    		field: 'name',

+				    		field_id: '<?php echo $c_id; ?>'

+						}, 					

+						submit  : '<?php echo __('Speichern', 'wpsg'); ?>',

+						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',

+						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',

+				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

+					});

+	

+	

+				</script>

+					

+			</td>

+		</tr>

+		<tr class="wpsg_customervar_row_<?php echo $c_id; ?>" id="row_auswahl_<?php echo $c_id; ?>" style="<?php echo (($c['typ'] == '1')?'':'display:none;'); ?>">

+			<td class="col0"></td>

+			<td class="col1"><?php echo __('Auswahlmöglichkeiten ("|" als Trenner)', 'wpsg'); ?></td>

+			<td class="col2345" colspan="4">

+				<input type="text" class="form-control wpsg-sm" name="pflicht[custom][<?php echo $c_id; ?>][auswahl]" value="<?php echo wpsg_hspc($c['auswahl']); ?>" />

+			</td>

+		</tr>

+		<?php } ?>

+	</tbody>

+</table>

+

 

-<script type="text/javascript">

+<script type="text/javascript">/* <![CDATA[ */

 

 	/**

 	 * Zeigt den HTML Code, der die gewählte Kundenvariablen in die Templates einbaut

@@ -45,73 +116,10 @@
 		

 	} // function wpsg_genPACode(pa_id)

 

-</script>

+/* ]]> */</script>

 

-<div id="wpsg_kv_code_dialog" style="display:none;"><div class="wpsg_dialog"></div></div>

-

-<table class="wpsg_customfields">			

-	<tr>

-		<th class="col0"><?php echo __('Index', 'wpsg'); ?></th>		

-		<th class="col1"><?php echo __('Kundenvariablen', 'wpsg'); ?></th>

-		<th class="col2"><?php echo __('Pflichtfeld', 'wpsg'); ?></th>

-		<th class="col3"><?php echo __('Typ', 'wpsg'); ?></th>

-		<th class="col4"></th>

-		<th class="col5">

-			<a class="wpsg_icon wpsg_icon_center wpsg_icon_remove" href="#" title="<?php echo __('Kundenvariable löschen', 'wpsg'); ?>" onclick="return false;"></a>

-		</th>

-	</tr>

-	<?php foreach ($this->view['pflicht']['custom'] as $c_id => $c) { ?>

-	<tr>

-		<td class="col0"><?php echo $c_id; ?></td>

-		<td class="col2 wpsg_editable" id="kundenvariable_name_<?php echo $c_id; ?>"><?php echo wpsg_hspc($c['name']); ?></td>

-		<td class="col3">

-			<select name="pflicht[custom][<?php echo $c_id; ?>][show]">

-				<option <?php echo (($c['show'] == '0')?'selected="selected"':''); ?> value="0"><?php echo __('Ja', 'wpsg'); ?></option>

-				<option <?php echo (($c['show'] == '1')?'selected="selected"':''); ?> value="1"><?php echo __('Nein', 'wpsg'); ?></option>

-				<option <?php echo (($c['show'] == '2')?'selected="selected"':''); ?> value="2"><?php echo __('Nicht zeigen', 'wpsg'); ?></option>

-			</select>

-		</td>

-		<td class="col3">

-			<select onchange="if (jQuery(this).val() == '1') jQuery('#row_auswahl_<?php echo $c_id; ?>').show(); else jQuery('#row_auswahl_<?php echo $c_id; ?>').hide();" name="pflicht[custom][<?php echo $c_id; ?>][typ]">

-				<option <?php echo (($c['typ'] == '0')?'selected="selected"':''); ?> value="0"><?php echo __('Textfeld', 'wpsg'); ?></option>

-				<option <?php echo (($c['typ'] == '1')?'selected="selected"':''); ?> value="1"><?php echo __('Auswahlfeld', 'wpsg'); ?></option>

-				<option <?php echo (($c['typ'] == '2')?'selected="selected"':''); ?> value="2"><?php echo __('Checkbox', 'wpsg'); ?></option>

-			</select>

-		</td>

-		<td class="col4">

-			<a class="wpsg_icon wpsg_icon_html wpsg_icon_center" href="#" title="<?php echo __('HTML Code generieren', 'wpsg'); ?>" onclick="return wpsg_genKVCode(<?php echo $c_id; ?>);"></a>

-		</td>

-		<td class="col5">

-			<input type="checkbox" value="1" name="pflicht[custom][<?php echo $c_id; ?>][del]" />

-			

-			<script type="text/javascript">

-			

-				jQuery('#kundenvariable_name_<?php echo $c_id; ?>').editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten&do=inlinedit&noheader=1', {

-					submitdata: { 

-			    		field: 'name',

-			    		field_id: '<?php echo $c_id; ?>'

-					}, 					

-					submit  : '<?php echo __('Speichern', 'wpsg'); ?>',

-					placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',

-					indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',

-			    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

-				});	

-

-			</script>

-				

-		</td>

-	</tr>

-	<tr id="row_auswahl_<?php echo $c_id; ?>" style="<?php echo (($c['typ'] == '1')?'':'display:none;'); ?>">

-		<td class="col0"></td>

-		<td class="col1"><?php echo __('Auswahlmöglichkeiten ("|" als Trenner)', 'wpsg'); ?></td>

-		<td class="col2345" colspan="4">

-			<input type="text" name="pflicht[custom][<?php echo $c_id; ?>][auswahl]" value="<?php echo wpsg_hspc($c['auswahl']); ?>" />

-		</td>

-	</tr>

-	<?php } ?>

-</table>

 <br />

-<?php echo wpsg_drawForm_Checkbox('wpsg_kundenvariablen_show', __('Kundenvariablen direkt abfragen', 'wpsg'), $this->get_option('wpsg_kundenvariablen_show')); ?>

+<?php echo wpsg_drawForm_Checkbox('wpsg_kundenvariablen_show', __('Kundenvariablen direkt abfragen', 'wpsg'), $this->get_option('wpsg_kundenvariablen_show'), array('fullWidth' => true)); ?>

 <?php } else { ?>

 <p><?php echo __('Keine benutzerdefinierten Kundenfelder angelegt.', 'wpsg'); ?>

 <?php } ?>
\ No newline at end of file
diff --git a/views/admin/kundendaten_tab3.phtml b/views/admin/kundendaten_tab3.phtml
new file mode 100644
index 0000000..815a37b
--- /dev/null
+++ b/views/admin/kundendaten_tab3.phtml
@@ -0,0 +1,18 @@
+<?php

+

+	/**

+	 * Template für die Kundenvoreinstellungen im Backend

+	 */

+

+?>

+

+<?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( '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/laender.phtml b/views/admin/laender.phtml
index e3fef52..45e2fa9 100644
--- a/views/admin/laender.phtml
+++ b/views/admin/laender.phtml
@@ -230,12 +230,6 @@
 				return false;

 

 			}

-

-			jQuery(document).ready(function() {

-

-				jQuery('.wpsg_form_help').tipTip();

-

-			} );	

         

 		/* ]]> */</script>

 	

diff --git a/views/admin/loadsavesettings.phtml b/views/admin/loadsavesettings.phtml
index 4ff2599..e5ea549 100644
--- a/views/admin/loadsavesettings.phtml
+++ b/views/admin/loadsavesettings.phtml
@@ -7,42 +7,40 @@
 ?>

 <div class="wpsg_admin_submenu">

 	

-	<div class="head">

-		<div class="title"><?php echo __("Einstellungen", "wpsg"); ?></div>			

-		<div style="clear:both;"></div>

-	</div>

-

-	<ul>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		

-		<li class="<?php echo (($k == $this->view['subAction'])?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a></li>

+	<div class="list-group">

+		<span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>		

+		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		 

+		<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>		

 		<?php } ?>

-	</ul>

+	</div> 

 			

 </div>

 		

-<div style="padding:0px; margin:0px; float:left;">

+<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=loadsavesettings&noheader=1'); ?>">

-  		<div class="wpsg_form_field">

-			<div class="wpsg_form_left">

-				<label for="wpsg_debugModus"><?php echo __('Einstellungen speichern', 'wpsg'); ?>:</label>

-			</div>

-			<div class="wpsg_form_right">

-				<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=loadsavesettings&noheader=1&wpsg_do=downloadsettings&submit=1'; ?>" title="<?php echo __('Einstellungen als XML Datei downloaden', 'wpsg'); ?>"><?php echo __('Download', 'wpsg'); ?></a>

-			</div>

-			<div class="wpsg_clear"></div>

-		</div>

-		<div class="wpsg_form_field">

-			<div class="wpsg_form_left">

-				<label for="wpsg_debugModus"><?php echo __('Einstellungen laden', 'wpsg'); ?>:</label>

-			</div>

-			<div class="wpsg_form_right">

-				<input type="file" name="wpsg_settings" />				

+	

+		<div class="panel panel-default">

+  			<div class="panel-heading clearfix">

+          		<h3 class="panel-title"><?php echo __('Einstellungen', 'wpsg'); ?></h3>

+        	</div>

+  			<div class="panel-body">

+	

+				<?php echo wpsg_drawForm_TextStart(); ?>

+				<a href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=loadsavesettings&noheader=1&wpsg_do=downloadsettings&submit=1'; ?>" title="<?php echo __('Einstellungen als XML Datei downloaden', 'wpsg'); ?>"><?php echo __('Download', 'wpsg'); ?></a>				

+				<?php echo wpsg_drawForm_TextEnd(__('Einstellungen speichern', 'wpsg')); ?>

+	

+				<?php echo wpsg_drawForm_TextStart(); ?>

+				<input type="file" name="wpsg_settings" />		

+				<?php echo wpsg_drawForm_TextEnd(__('Einstellungen laden', 'wpsg')); ?>

+ 				

 			</div>

-			<div class="wpsg_clear"></div>

 		</div>

+				

 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen übernehmen', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p> 

+		

 		<p class="wpsg_hinweis">

 			<?php echo __('Derzeit werden nur die Einstellungen gespeichert. Produkte/Kunden/Bestellungen etc. sind nicht enthalten!', 'wpsg'); ?>

 		</p>

+		

 	</form>

 </div>
\ No newline at end of file
diff --git a/views/admin/module.phtml b/views/admin/module.phtml
index ec04f3f..4d08b2d 100644
--- a/views/admin/module.phtml
+++ b/views/admin/module.phtml
@@ -179,8 +179,6 @@
 		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();

 		

 	} );

diff --git a/views/admin/presentation.phtml b/views/admin/presentation.phtml
index 10958eb..54ac5ad 100644
--- a/views/admin/presentation.phtml
+++ b/views/admin/presentation.phtml
@@ -7,43 +7,37 @@
 ?>

 <div class="wpsg_admin_submenu">

 	

-	<div class="head">

-		<div class="title"><?php echo __("Einstellungen", "wpsg"); ?></div>			

-		<div style="clear:both;"></div>

-	</div>

-

-	<ul>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		

-		<li class="<?php echo (($k == $this->view['subAction'])?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a></li>

+	<div class="list-group">

+		<span class="list-group-head list-group-item"><?php echo __('Konfiguration'); ?></span>		

+		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		 

+		<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>		

 		<?php } ?>

-	</ul>

+	</div> 

 			

 </div>

 		

-<div style="padding:0px; margin:0px; float:left;">

+<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=presentation&noheader=1'); ?>">

 	 

-	 	<?php echo wpsg_drawForm_Checkbox('wpsg_showMwstAlways', __('MwSt. Spalte auch bei einem Satz zeigen', 'wpsg'), $this->get_option('wpsg_showMwstAlways')); ?>

-	 	<?php echo wpsg_drawForm_Checkbox('wpsg_showArticelnumber', __('Artikelnummer im Produkttemplate anzeigen', 'wpsg'), $this->get_option('wpsg_showArticelnumber')); ?>

-	 	<?php echo wpsg_drawForm_Select('wpsg_form_validation', __('Formular Validierung', 'wpsg'), array(

-	 		'0' => __('Serverseitig', 'wpsg'),

-	 		'1' => __('Serverseitig + Javascript V1', 'wpsg'),

-	 		'2' => __('Serverseitig + Javascript V2', 'wpsg')

-	 	), $this->get_option('wpsg_form_validation')); ?>	

-	 	<?php echo wpsg_drawForm_Checkbox('wpsg_hideBasketCountrySelect', __('Länderauswahl im Warenkorb verbergen', 'wpsg'), $this->get_option('wpsg_hideBasketCountrySelect')); ?>

-	 		 		 

-	 	<?php $this->callMods('admin_presentation'); ?>

+	 	<div class="panel panel-default">

+  			<div class="panel-heading clearfix">

+          		<h3 class="panel-title"><?php echo __('Einstellungen', 'wpsg'); ?></h3>

+        	</div>

+  			<div class="panel-body">

 	 

-		<script type="text/javascript">

-

-			jQuery(document).ready(function() {

- 

-				jQuery('.wpsg_form_help').tipTip();

-				

-			} );

-		

-		</script>

-		

+	 			<?php echo wpsg_drawForm_Select('wpsg_form_validation', __('Formular Validierung', 'wpsg'), array(

+	 				'0' => __('Serverseitig', 'wpsg'),

+	 				'1' => __('Serverseitig + Javascript V1', 'wpsg'),

+	 				'2' => __('Serverseitig + Javascript V2', 'wpsg')

+	 			), $this->get_option('wpsg_form_validation')); ?>

+	 			<?php $this->callMods('admin_presentation'); ?>

+			 	<?php echo wpsg_drawForm_Checkbox('wpsg_showMwstAlways', __('MwSt. Spalte auch bei einem Satz zeigen', 'wpsg'), $this->get_option('wpsg_showMwstAlways')); ?>

+			 	<?php echo wpsg_drawForm_Checkbox('wpsg_showArticelnumber', __('Artikelnummer im Produkttemplate anzeigen', 'wpsg'), $this->get_option('wpsg_showArticelnumber')); ?>

+			 	<?php echo wpsg_drawForm_Checkbox('wpsg_hideBasketCountrySelect', __('Länderauswahl im Warenkorb verbergen', 'wpsg'), $this->get_option('wpsg_hideBasketCountrySelect')); ?>

+			 	

+			 </div>

+		</div>

+	 		 

 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 	

 	</form>

diff --git a/views/admin/shopdata.phtml b/views/admin/shopdata.phtml
index a9d1ca0..892962d 100644
--- a/views/admin/shopdata.phtml
+++ b/views/admin/shopdata.phtml
@@ -65,14 +65,5 @@
 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 		

   	</form>

-

-	<script type="text/javascript">/* <![CDATA[ */
-	

-		jQuery(document).ready(function() {

-		

-			jQuery('.wpsg_form_help').tipTip();

-			

-		} );
-	
-	/* ]]> */</script>

+  	

 </div>
\ No newline at end of file
diff --git a/views/admin/versandzonen_list.phtml b/views/admin/versandzonen_list.phtml
index 5e15862..d76e497 100644
--- a/views/admin/versandzonen_list.phtml
+++ b/views/admin/versandzonen_list.phtml
@@ -35,7 +35,7 @@
 			

 			<script type="text/javascript">/* <![CDATA[ */

 

-				jQuery('#vz_<?php echo $vz['id']; ?>_name').editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', {

+				jQuery('#vz_<?php echo $vz['id']; ?>_name').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', {

 					submitdata: { 

 			    		field: 'name',

 			    		vz_id: '<?php echo $vz['id']; ?>'

@@ -46,7 +46,7 @@
 			    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

 				});

 			

-				jQuery('#vz_<?php echo $vz['id']; ?>_value').editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', {

+				jQuery('#vz_<?php echo $vz['id']; ?>_value').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=inlinedit&noheader=1', {

 					submitdata: { 

 			    		field: 'value',

 			    		vz_id: '<?php echo $vz['id']; ?>'