From 1a5382bd8186a4a41eb3d7ff032d7f34784ac61e Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Wed, 21 Dec 2016 15:13:25 +0000
Subject: Korrektur Notizen und Warnungen

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5997 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_versandarten/list.phtml          | 393 ++++++++++--------------
 views/mods/mod_versandarten/settings_edit.phtml |   3 +-
 2 files changed, 170 insertions(+), 226 deletions(-)

(limited to 'views/mods/mod_versandarten')

diff --git a/views/mods/mod_versandarten/list.phtml b/views/mods/mod_versandarten/list.phtml
index 98b80ea..173bac9 100644
--- a/views/mods/mod_versandarten/list.phtml
+++ b/views/mods/mod_versandarten/list.phtml
@@ -8,234 +8,177 @@
 <?php if (!is_array($this->view['data']) || sizeof($this->view['data']) <= 0) { ?>
 <?php echo __('Bisher keine Versandarten angelegt.', 'wpsg'); ?>
 <?php } else { ?>
-<table class="va_table">
-	 <colgroup>
-    	<col class="wpsg_label" />
-    	<col class="wpsg_value" /> 
-    	<col class="wpsg_delcol" />
-  	</colgroup>
+
+	<?php foreach ($this->view['arVZ'] as $k=>$vz) { $arVzNamen[$k] = $vz['name']; } ?>
+
 	<?php $i = 0; foreach ($this->view['data'] as $va) { $i ++; ?>
-	<tr>
-		<td class="wpsg_label"><?php echo __('ID', 'wpsg'); ?>:</td>
-		<td class="wpsg_value"><?php echo $va['id']; ?></td>	
-		<td class="wpsg_delcol">
-			<a class="wpsg_glyphicon_right glyphicon glyphicon-minus-sign" href="#" title="<?php echo __('Versandart löschen', 'wpsg'); ?>" onclick="return wpsg_removeVA(<?php echo $va['id']; ?>);"></a>
-			<?php foreach ($this->view['arVZ'] as $k=>$vz) { $arVzNamen[$k] = $vz['name']; } ?>
-			<script type="text/javascript">
-
-				jQuery(document).ready(function() {
-
-					jQuery('#va_<?php echo $va['id']; ?>_name').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
-						submitdata: { 
-				    		field: 'name',
-				    		va_id: '<?php echo $va['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'); ?>'
-					});
-
-					jQuery('#va_<?php echo $va['id']; ?>_kosten').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
-						submitdata: { 
-				    		field: 'kosten',
-				    		va_id: '<?php echo $va['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'); ?>'
-					});
-
-					jQuery('#va_<?php echo $va['id']; ?>_hint').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
-						submitdata: { 
-				    		field: 'hint',
-				    		va_id: '<?php echo $va['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'); ?>'
-					});
- 					
-					jQuery('#va_<?php echo $va['id']; ?>_typ').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { 
-						submitdata: {
-							field: 'typ',
-							va_id: '<?php echo $va['id']; ?>'
-						},
-						submit  : '<?php echo __('Speichern', 'wpsg'); ?>',
-						data   : <?php echo wpsg_prepare_for_inlineEdit($this->view['arTypen']); ?>,
-						type   : 'select',
-						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
-					});		
-
-					jQuery('#va_<?php echo $va['id']; ?>_vz').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
-						submitdata: {
-							field: 'vz',
-							va_id: '<?php echo $va['id']; ?>'
-						},
-						submit: '<?php echo __('Speichern', 'wpsg'); ?>',
-						data   : <?php echo wpsg_prepare_for_inlineEdit($arVzNamen) ?>,
-						type   : 'select',
-						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-				    	callback: function(data)
-				    	{
-							location.reload();
-				    	}
-
-					} );		
-
-					jQuery('#va_<?php echo $va['id']; ?>_mwst').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', { 
-						submitdata: {
-							field: 'mwst_key',
-							va_id: '<?php echo $va['id']; ?>'
-						},
-						submit: '<?php echo __('Speichern', 'wpsg'); ?>',
-						data: <?php echo wpsg_prepare_for_inlineEdit(wpsg_tax_groups()); ?>,
-						type: 'select',
-						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'
-					});	
-
-					
-					jQuery('#va_<?php echo $va['id']; ?>_aktiv').bind('change', function() {
-
-						var value = 0;
-						 
-						if (jQuery(this).attr("checked") == "checked") value = 1;
-
-						jQuery.ajax( {
-							url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1',
-							data: {
-								field: 'aktiv',
-								va_id: '<?php echo $va['id']; ?>',
-								value: value
-							}	
-						} );
-						 
-					} );
-					
+
+    <hr />
+	<div id="wpsg_mod_versandarten_row_<?php echo $va['id']; ?>">
+
+	    <?php echo wpsg_drawForm_TextStart(); ?>
+    	<?php echo $va['id']; ?>
+		<a data-id="<?php echo $va['id']; ?>" class="wpsg_oc_removeLink" href="#" onclick="return wpsg_removeVA(<?php echo $va['id']; ?>);" title="<?php echo __('Versandart löschen', 'wpsg'); ?>">
+		<span class="wpsg_glyphicon_right glyphicon glyphicon-trash"></span></a>
+    	<?php echo wpsg_drawForm_TextEnd(__('ID', 'wpsg')); ?>
+
+        <?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>
+        <?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', {
+                submitdata: {
+                    field: 'name',
+                    va_id: '<?php echo $va['id']; ?>'
+                }
+            });
+        /* ]]> */</script>
+
+        <?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>
+        <?php echo wpsg_drawForm_TextEnd(__('Aktiv', 'wpsg')); ?>
+        <script type="text/javascript">/* <![CDATA[ */
+			jQuery('#va_<?php echo $va['id']; ?>_aktiv').bind('change', function() {
+
+				var value = 0;
+				if (jQuery(this).attr("checked") == "checked") value = 1;
+
+				jQuery.ajax( {
+					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1',
+					data: {
+						field: 'aktiv',
+						va_id: '<?php echo $va['id']; ?>',
+						value: value
+					}	
 				} );
-			
-			</script>
-			
-		</td>
-	</tr>
-	<tr>
-		<td class="wpsg_label"><?php echo __('Bezeichnung', 'wpsg'); ?>:</td>
-		<td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id']; ?>_name"><?php echo wpsg_hspc($va['name']); ?></td>
-		<td class="wpsg_delcol">
-			<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>
-		</td>
-	</tr>
-	<tr>
-		<td class="wpsg_label"><label for="va_<?php echo $va['id']; ?>_aktiv"><?php echo __('Aktiv', 'wpsg'); ?>:</label></td>
-		<td class="wpsg_value">
-			<input type="checkbox" value="1" <?php echo (($va['aktiv'] === '1')?'checked="checked"':''); ?> id="va_<?php echo $va['id']; ?>_aktiv" />
-		</td>
-		<td class="wpsg_delcol">
-			<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>
-		</td> 
-	</tr>
-	<tr>
-		<td class="wpsg_label"><?php echo __('Hinweistext', 'wpsg'); ?>:</td>
-		<td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id']; ?>_hint" ><?php echo wpsg_hspc($va['hint']); ?></td>
-		<td class="wpsg_delcol">
-			<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>
-		</td>
-	</tr>
-	<tr>
-		<td class="wpsg_label"><?php echo __('Grundlage', 'wpsg'); ?>:</td>
-		<td id="va_<?php echo $va['id']; ?>_typ" class="wpsg_value wpsg_editable"><?php echo wpsg_hspc($this->view['arTypen'][$va['typ']]); ?></td>
-		<td class="wpsg_delcol">
-			<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>
-		</td>
-	</tr>   
-	<tr>
-		<td class="wpsg_label"><?php echo __('Versandzone', 'wpsg'); ?>:</td>
-		<td id="va_<?php echo $va['id']; ?>_vz" class="wpsg_value wpsg_editable">
-			<?php if ($va['vz'] > 0) { ?>
-			<?php echo wpsg_hspc($this->view['arVZ'][$va['vz']]['name']); ?>
-			<?php } else { ?>
-			<?php echo __('Alle Versandzonen', 'wpsg'); ?>
-			<?php } ?>
-		</td>
-		<td class="wpsg_delcol">
-			<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>
-		</td>
-	</tr>
-	<tr>
-		<td class="wpsg_label"><?php echo __('Kostenschlüssel', 'wpsg'); ?>:</td>
-		<td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id']; ?>_kosten"><?php echo wpsg_hspc($va['kosten']); ?></td>
-		<td class="wpsg_delcol">
-			<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" 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>
-		</td>
-	</tr>
-	<?php if (wpsg_isSizedArray($this->view['arVZ'][$va['vz']]['arPLZ'])) { ?>
-	<?php $index = 1; foreach ((array)$this->view['arVZ'][$va['vz']]['arPLZ'] as $plz_key => $plz) { ?>
-	<tr>
-		<td class="wpsg_label"><?php echo __('Kostenschlüssel PLZ', 'wpsg'); ?> [ <?php echo $plz ?> ]:</td>
-		<td class="wpsg_value wpsg_editable" id="va_<?php echo $va['id'] ?>_plz_<?php echo $index ?>"><?php echo wpsg_hspc($va['kosten_plz'][$plz_key]); ?></td>
-		<td class="wpsg_delcol">			
-			<script type="text/javascript">
-
-				jQuery(document).ready(function() {
-	
-					jQuery('#va_<?php echo $va['id']; ?>_plz_<?php echo $index ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
-						submitdata: { 
-				    		field: 'kosten_plz',
-				    		va_id: '<?php echo $va['id']; ?>',
-				    		key: '<?php echo $index; ?>'
-						}, 					
-						submit  : '<?php echo __('Speichern', 'wpsg'); ?>',
-						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',
-				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',
-				    	callback: function(data)
-				    	{
-				    		//location.reload();
-				    	}
-					} );
+			} );
+        /* ]]> */</script>
+
+        <?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>
+        <?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', {
+                submitdata: {
+                    field: 'hint',
+                    va_id: '<?php echo $va['id']; ?>'
+                }
+            });
+        /* ]]> */</script>
+
+        <?php echo wpsg_drawForm_TextStart(); ?>
+        <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>
+        <?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', {
+                type: 'select',
+				data: <?php echo wpsg_prepare_for_inlineEdit($this->view['arTypen']); ?>,
+	            submitdata: {
+                    field: 'typ',
+                    va_id: '<?php echo $va['id']; ?>'
+                }
+            });
+        /* ]]> */</script>
+
+        <?php echo wpsg_drawForm_TextStart(); ?>
+        <span id="va_vz_<?php echo $va['id']; ?>">
+        <?php if ($va['vz'] > 0) { ?>
+        	<?php echo wpsg_hspc($this->view['arVZ'][$va['vz']]['name']); ?>
+        	<?php } else { ?>
+        	<?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>
+        <?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', {
+                type: 'select',
+				data   : <?php echo wpsg_prepare_for_inlineEdit($arVzNamen) ?>,
+	            submitdata: {
+                    field: 'vz',
+                    va_id: '<?php echo $va['id']; ?>'
+                }
+            });
+        /* ]]> */</script>
+
+        <?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>
+        <?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', {
+                submitdata: {
+                    field: 'kosten',
+                    va_id: '<?php echo $va['id']; ?>'
+                }
+            });
+        /* ]]> */</script>
+
+		<?php if (wpsg_isSizedArray($this->view['arVZ'][$va['vz']]['arPLZ'])) { ?>
+		<?php $index = 1; foreach ((array)$this->view['arVZ'][$va['vz']]['arPLZ'] as $plz_key => $plz) { ?>
 	
+        	<?php echo wpsg_drawForm_TextStart(); ?>
+        	<span id="va_plz_<?php echo $va['id'].'_'.$index; ?>"><?php echo wpsg_hspc(wpsg_getStr($va['kosten_plz'][$plz_key])); ?></span>
+        	<?php echo wpsg_drawForm_TextEnd(__('Kostenschlüssel PLZ', 'wpsg').' ['.$plz.']:'); ?> <?php /*echo $plz*/ ?>
+        	<script type="text/javascript">/* <![CDATA[ */
+            	jQuery('#va_plz_<?php echo $va['id'].'_'.$index; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1', {
+                	submitdata: {
+                    	field: 'kosten_plz',
+                    	va_id: '<?php echo $va['id']; ?>',
+                    	key: '<?php echo $index; ?>'
+                	}
+            	});
+        	/* ]]> */</script>
+
+		<?php $index++; } ?>
+		<?php } ?>
+
+        <?php echo wpsg_drawForm_TextStart(); ?>
+        <span id="va_mwst_key_<?php echo $va['id']; ?>"><?php
+        	$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>
+        <?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', {
+                type: 'select',
+				data: <?php echo wpsg_prepare_for_inlineEdit(wpsg_tax_groups()); ?>,
+	                submitdata: {
+                    field: 'mwst_key',
+                    va_id: '<?php echo $va['id']; ?>'
+                }
+            });
+        /* ]]> */</script>
+
+        <?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>
+        <?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() {
+
+				var value = 0;
+				if (jQuery(this).attr("checked") == "checked") value = 1;
+
+				jQuery.ajax( {
+					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1',
+					data: {
+						field: 'mwst_laender',
+						va_id: '<?php echo $va['id']; ?>',
+						value: value
+					}	
 				} );
-				
-			</script>
-		</td>		
-	</tr>
-	<?php $index++; } ?>
-	<?php } ?>	
-	<tr>
-		<td class="wpsg_label"><?php echo __('Steuersatz', 'wpsg'); ?>:</td>				
-		<td id="va_<?php echo $va['id']; ?>_mwst" class="wpsg_value wpsg_editable"><?php 
-		
-			$tax_groups = wpsg_tax_groups();
-			echo wpsg_hspc($tax_groups[$va['mwst_key']]);
-			
-		?></td>
-		<td class="wpsg_delcol">
-			<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>
-		</td>
-	</tr> 
-	<tr>
-		<td class="wpsg_label"><?php echo __('Keine MwSt. wenn Land steuerfrei', 'wpsg'); ?>:</td>
-		<td class="wpsg_value">
-			<input onchange="wpsg_saveVAMwSt(this, <?php echo $va['id']; ?>);" <?php echo (($va['mwst_laender'] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" />
-		</td>
-		<td class="wpsg_delcol">
-			<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>
-		</td>
-	</tr>
+			} );
+        /* ]]> */</script>
+	</div>
+	<?php if ($i == sizeof($this->view['data'])) { ?><hr /><?php } ?>
 
-	
-	<?php $this->callMods('wpsg_mod_versandarten_listrow', array(&$va)); ?>
-	<?php if ($i < sizeof($this->view['data'])) { ?>
-	<tr class="wpsg_spacer"><td colspan="3"><hr /></td></tr>
-	<?php } ?>
-	<?php } ?>
-</table>
+<?php } ?> 
 <?php } ?> 
\ No newline at end of file
diff --git a/views/mods/mod_versandarten/settings_edit.phtml b/views/mods/mod_versandarten/settings_edit.phtml
index 9553eee..adae7d5 100644
--- a/views/mods/mod_versandarten/settings_edit.phtml
+++ b/views/mods/mod_versandarten/settings_edit.phtml
@@ -89,12 +89,13 @@
 		<div class="title">
 			<div class="fulltab">
 				<?php echo __('Versandarten', 'wpsg'); ?>
-				<a title="<?php echo __('Neue Versandart anlegen', 'wpsg'); ?>" href="" class="wpsg_glyphicon_right glyphicon glyphicon-plus-sign" onclick="return wpsg_addVA();"></a>
 			</div>
 		</div>
 	</div>
 	<div class="content" id="wpsg_va_list">
 		<?php echo $this->mod->va_list(); ?>
 	</div>
+
+	<a href="#" onclick="return wpsg_addVA();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span>Neue Versandart anlegen</a>
 			
 </div>
-- 
cgit v1.2.3