From 4d3303d73fbb0cd8e7a05fa47650b791835b5dcb Mon Sep 17 00:00:00 2001
From: hartmut <noreply@maennchen1.de>
Date: Fri, 2 Jun 2017 12:39:50 +0000
Subject: Korrektur Länder und Versandzonen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6306 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/laender.phtml           | 22 ++++++++++++++++++++++
 views/admin/laender_list.phtml      |  8 ++++----
 views/admin/versandzonen.phtml      | 11 ++++++-----
 views/admin/versandzonen_list.phtml |  4 ++++
 4 files changed, 36 insertions(+), 9 deletions(-)

(limited to 'views/admin')

diff --git a/views/admin/laender.phtml b/views/admin/laender.phtml
index 72aa5fc..6c91a39 100644
--- a/views/admin/laender.phtml
+++ b/views/admin/laender.phtml
@@ -63,6 +63,28 @@
 
 	    function wpsg_country_check_all() { jQuery('td.col_check input').each(function() { jQuery(this).prop('checked', !jQuery(this).prop('checked')); } ); }
 
+		function wpsg_country_remove(land_id)
+		{
+
+			if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false;
+
+			jQuery.ajax( {
+				url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender&do=remove&noheader=1',
+				data: {
+					land_id: land_id
+				},
+				success: function(data) {
+											 
+					if (data === "1") jQuery('#wpsg_laenderrow_' + land_id).remove();
+					else alert(data);
+					
+				}
+			} );
+			
+			return false;
+
+		}
+
 		function wpsg_country_add()
 		{
 
diff --git a/views/admin/laender_list.phtml b/views/admin/laender_list.phtml
index e887dbd..dd0e8fb 100644
--- a/views/admin/laender_list.phtml
+++ b/views/admin/laender_list.phtml
@@ -1,6 +1,6 @@
 <?php
 
-    /**  Lieste der Länder im Backend */
+    /**  Liste der Länder im Backend */
 
 ?>
 
@@ -25,7 +25,7 @@
 
         <tbody>
             <?php foreach ($this->view['data'] as $l) { ?>
-                <tr id="<?php echo $l['id']; ?>" class="<?php echo (($this->get_option('wpsg_defaultland') == $l['id'])?'bg-info':''); ?>">
+                <tr id="wpsg_laenderrow_<?php echo $l['id']; ?>" class="<?php echo (($this->get_option('wpsg_defaultland') == $l['id'])?'bg-info':''); ?>">
                     <td class="col_check"><input type="checkbox" value="1" name="arDelete[<?php echo $l['id']; ?>]" /></td>
                     <td class="col_name"><?php echo wpsg_hspc($l['name'].((wpsg_isSizedString($l['kuerzel']))?' ('.$l['kuerzel'].')':'')); ?></td>
                     <td class="col_vz">
@@ -57,7 +57,7 @@
                     <td class="col_action">
 
                         <a href="#" onclick="return wpsg_country_edit('<?php echo $l['id']; ?>');" class="glyphicon glyphicon-pencil"></a>
-                        <a href="#" class="glyphicon glyphicon-trash"></a>
+                        <a href="#" onclick="return wpsg_country_remove('<?php echo $l['id']; ?>');" class="glyphicon glyphicon-trash"></a>
 
                     </td>
                 </tr>
@@ -66,7 +66,7 @@
         <tfoot>
             <tr>
 
-                <td class="col_check"><span class="glyphicon glyphicon-trash"></span></td>
+                <td class="col_check"><!-- <span class="glyphicon glyphicon-trash"></span> --></td>
                 <td colspan="8">
 
                     <input type="submit" name="submit" onclick="return confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>');" class="button btn-xs" value="<?php echo __('Markierte Länder löschen', 'wpsg'); ?>" />
diff --git a/views/admin/versandzonen.phtml b/views/admin/versandzonen.phtml
index fb73e8e..f823780 100644
--- a/views/admin/versandzonen.phtml
+++ b/views/admin/versandzonen.phtml
@@ -21,9 +21,10 @@
 	
 	<?php echo wpsg_drawForm_AdminboxStart(__('Versandzonen', 'wpsg')); ?>
 	
-		<br />
 		<span id="wpsg_vz_list"><?php $this->view['adminController']->vz_listAction(); ?></span>
 	
+		<a href="#" onclick="return wpsg_addVZ();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neue Versandzone anlegen.', 'wpsg'); ?></a><br />
+	    <br />
 		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Länderverwaltung', 'wpsg'); ?></a>
 	
 	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
@@ -33,12 +34,12 @@
 <script type="text/javascript">/* <![CDATA[ */
 
 	/**
-	 * Wird aufgerufen um einen neuen Satz hinzuzufügen und die Liste neu zu lasen.
+	 * Wird aufgerufen um einen neuen Satz hinzu zufügen und die Liste neu zu laden.
 	 */
 	function wpsg_addVZ()
 	{
 
-		jQuery('#wpsg_vz_list').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+		jQuery('#wpsg_vz_list').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" /><br />');
 		
 		jQuery.ajax( {
 			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=add&noheader=1',
@@ -57,9 +58,9 @@
 	function wpsg_removeVZ(vz_id)
 	{
 
-		if (!confirm('<?php echo __('Sind Sie sich sicher, dass sie diese Versandzone löschen möchten?', 'wpsg'); ?>')) return false;
+		if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Versandzone löschen möchten?', 'wpsg'); ?>')) return false;
 
-		jQuery('#wpsg_vz_list').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');
+		jQuery('#wpsg_vz_list').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" /><br />');
 		
 		jQuery.ajax( {
 			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=vz&do=remove&noheader=1',
diff --git a/views/admin/versandzonen_list.phtml b/views/admin/versandzonen_list.phtml
index 9b9d096..61b8ddf 100644
--- a/views/admin/versandzonen_list.phtml
+++ b/views/admin/versandzonen_list.phtml
@@ -9,11 +9,14 @@
 <?php echo __('Bisher keine Versandzonen hinterlegt.', 'wpsg'); ?>
 <?php } else { ?>
 <table class="table wpsg_table_vz">
+	<thead>
 	<tr>
 		<th class="col_name"><?php echo __('Bezeichnung', 'wpsg'); ?></th>
 		<th class="col_innereu"><?php echo __('Inner- gemeinschaftlich', 'wpsg'); ?></th>
 		<th class="col_aktion"></th>
 	</tr>
+	</thead>
+	<tbody>
 	<?php foreach ($this->view['data'] as $vz) { ?>
 	<tr>
 		<td class="wpsg_editable col_name">
@@ -60,6 +63,7 @@
 		</td>
 	</tr>
 	<?php } ?>
+	</tbody>
 </table>
 
 <script type="text/javascript">/* <![CDATA[ */
-- 
cgit v1.2.3