Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 5749)
+++ /controller/wpsg_ShopController.class.php	(revision 5750)
@@ -131,4 +131,17 @@
 								
 			}
+
+			$this->arStatus = array(
+				self::STATUS_EINGEGANGEN => __('Eingegangen', 'wpsg'),
+				self::STATUS_AUFTRAGAKZEPTIERT => __('Auftrag akzeptiert', 'wpsg'),
+				self::STATUS_ZAHLUNGAKZEPTIERT => __('Zahlung akzeptiert', 'wpsg'),
+				self::STATUS_RECHNUNGGESCHRIEBEN => __('Rechnung geschrieben', 'wpsg'),
+				self::STATUS_ZAHLUNGFEHLGESCHLAGEN => __('Zahlung fehlgeschlagen', 'wpsg'),
+				self::STATUS_WAREVERSENDET => __('Ware versendet', 'wpsg'),
+				self::STATUS_ZUGESTELLT => __("zugestellt", "wpsg"),
+				self::STATUS_ZURUECKGEZAHLT => __("zurÃŒckgezahlt", "wpsg"),
+				self::STATUS_STORNIERT => __("storniert", "wpsg"),
+				self::STATUS_UNVOLLSTAENDIG => __('UnvollstÀndig', 'wpsg'),
+			);
 						
 		} // public function __construct()
@@ -655,5 +668,5 @@
 				wp_enqueue_script('jquery-ui-datepicker-de', $this->url(WPSG_URL_CONTENT.'plugins/'.WPSG_FOLDERNAME.'/lib/ui/jquery.ui.datepicker-de.js'), array('jquery', 'jquery-ui-core'));
 			
-				if (in_array(wpsg_getStr($_REQUEST['page']), array('wpsg-Admin', 'wpsg-Produkt', 'wpsg-Order')))
+				//if (in_array(wpsg_getStr($_REQUEST['page']), array('wpsg-Admin', 'wpsg-Produkt', 'wpsg-Order')))
 				{
 				
@@ -2485,18 +2498,5 @@
 				
 			$this->checkEscape();
-			
-			$this->arStatus = array(
-				self::STATUS_EINGEGANGEN => __('Eingegangen', 'wpsg'),								
-				self::STATUS_AUFTRAGAKZEPTIERT => __('Auftrag akzeptiert', 'wpsg'),
-				self::STATUS_ZAHLUNGAKZEPTIERT => __('Zahlung akzeptiert', 'wpsg'),
-				self::STATUS_RECHNUNGGESCHRIEBEN => __('Rechnung geschrieben', 'wpsg'),
-				self::STATUS_ZAHLUNGFEHLGESCHLAGEN => __('Zahlung fehlgeschlagen', 'wpsg'),
-				self::STATUS_WAREVERSENDET => __('Ware versendet', 'wpsg'),
-				self::STATUS_ZUGESTELLT => __("zugestellt", "wpsg"),
-				self::STATUS_ZURUECKGEZAHLT => __("zurÃŒckgezahlt", "wpsg"),
-				self::STATUS_STORNIERT => __("storniert", "wpsg"),
-				self::STATUS_UNVOLLSTAENDIG => __('UnvollstÀndig', 'wpsg'),
-			);
-			
+
 			// Das Land muss vor addShipping gesetzt werden
 			if (isset($_REQUEST['wpsg']['checkout']['shipping_land'])) $_SESSION['wpsg']['checkout']['shipping_land'] = $_REQUEST['wpsg']['checkout']['shipping_land'];
Index: /model/wpsg_customer.class.php
===================================================================
--- /model/wpsg_customer.class.php	(revision 5749)
+++ /model/wpsg_customer.class.php	(revision 5750)
@@ -73,4 +73,26 @@
 		} // public function getName()
 
+		/**
+		 * Darstellung des Kunden
+		 */
+		public function getLabel()
+		{
+
+			return trim($this->getFirstname().' '.$this->getName(). ' ('.$this->getNr().')');
+
+		} // public function getLabel()
+
+		/**
+		 * Gibt die Firma zurÃŒck
+		 */
+		public function getCompany()
+		{
+
+			$company = $this->firma;
+
+			return $company;
+
+		} // public function getCompany()
+
 		/** Gibt die Kundennummer zurÃŒck */
 		public function getNr() { return $this->knr; } // public function getNr()
@@ -215,5 +237,15 @@
 			
 		} // public function getOrderAmount($order_status = false)
-		
+
+		/**
+		 * Gibt die Anzahl der Bestellungen des Kunden zurÃŒck
+		 */
+		public function getOrderCount()
+		{
+
+			return wpsg_order::count(array('k_id' => $this->id));
+
+		} // public function getOrderCount()
+
 		/**
 		 * Gibt die ID des Landes zurÃŒck
@@ -247,13 +279,51 @@
 			
 		} // public function getCountryName()
- 
+
+		/* Statische Funktionen */
+
+		/**
+		 * ZÀhlt die Bestellungen anhand des Filters
+		 */
+		public static function count($arFilter)
+		{
+
+			list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
+
+			$strQuery = "
+				SELECT
+					COUNT(*)
+				FROM
+					(
+						SELECT
+						  	DISTINCT K.`id`
+						FROM
+							`".WPSG_TBL_KU."` AS K
+							".$strQueryJOIN."
+						WHERE
+							1
+							".$strQueryWHERE." 
+						HAVING
+							1
+							".$strQueryHAVING."											
+					) AS innerSelect
+			";
+
+			return $GLOBALS['wpsg_db']->fetchOne($strQuery);
+
+		} // public static function count($arFilter)
+
 		public static function find($arFilter = array())
 		{
 			
-			list($strQueryWHERE, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
+			list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
+
+			$strLimit = "";
+
+			if (wpsg_isSizedArray($arFilter['limit'])) $strLimit = "LIMIT ".wpsg_q($arFilter['limit'][0]).", ".wpsg_q($arFilter['limit'][1]);
 			
 			$strQuery = "
 				SELECT
 					K.`id`
+					".$strQuerySELECT."
 				FROM
 					`".WPSG_TBL_KU."` AS K
@@ -266,4 +336,5 @@
 				ORDER BY
 					".$strQueryORDER."		
+				".$strLimit."
 			";	
 			 
@@ -284,9 +355,16 @@
 		public static function getQueryParts($arFilter = array())
 		{
-				
+
+			$strQuerySELECT = "";
 			$strQueryWHERE = "";
+			$strQueryJOIN = "";
 			$strQueryHAVING = "";
 			$strQueryORDER = " K.`id` ASC ";
-			 
+
+			$strQuerySELECT .= ",
+				(SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` != '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count,
+				(SELECT COUNT(*) FROM `".WPSG_TBL_ORDER."` AS O WHERE O.`k_id` = K.`id` AND O.`status` = '".wpsg_q(wpsg_ShopController::STATUS_UNVOLLSTAENDIG)."') AS order_count_incomplete
+			";
+
 			if (wpsg_isSizedString($arFilter['email']))
 			{
@@ -295,6 +373,21 @@
 				
 			}
-				
-			return array($strQueryWHERE, $strQueryHAVING, $strQueryORDER);
+
+			if (wpsg_isSizedString($arFilter['s']))
+			{
+
+				$strQueryWHERE .= " 
+					AND (
+						K.`name` LIKE '%".wpsg_q($arFilter['s'])."%' OR
+						K.`vname` LIKE '%".wpsg_q($arFilter['s'])."%' OR
+						K.`email` LIKE '%".wpsg_q($arFilter['s'])."%' OR
+						K.`id` = '".wpsg_q($arFilter['s'])."' OR
+						K.`knr` LIKE '%".wpsg_q($arFilter['s'])."%'
+					)
+				";
+
+			}
+				
+			return array($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER);
 				
 		} // public function getQueryParts($arFilter = array())
Index: /model/wpsg_order.class.php
===================================================================
--- /model/wpsg_order.class.php	(revision 5749)
+++ /model/wpsg_order.class.php	(revision 5750)
@@ -898,5 +898,5 @@
 		{
 
-			list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryString($arFilter);
+			list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
 
 			$strQuery = "
@@ -906,5 +906,5 @@
 					(
 						SELECT
-						  	O.`id`
+						  	DISTINCT O.`id`
 						FROM
 							`".WPSG_TBL_ORDER."` AS O
@@ -912,7 +912,5 @@
 						WHERE
 							1
-							".$strQueryWHERE."
-						GROUP BY 
-							O.`id` 
+							".$strQueryWHERE." 
 						HAVING
 							1
@@ -932,5 +930,5 @@
 		{
 			
-			list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryString($arFilter);
+			list($strQuerySELECT, $strQueryWHERE, $strQueryJOIN, $strQueryHAVING, $strQueryORDER) = self::getQueryParts($arFilter);
 
 			$strLimit = "";
@@ -976,5 +974,5 @@
 		} // public static function find($arFilter = array())
 
-		public static function getQueryString($arFilter = array())
+		public static function getQueryParts($arFilter = array())
 		{
 
Index: /mods/wpsg_mod_kundenverwaltung.class.php
===================================================================
--- /mods/wpsg_mod_kundenverwaltung.class.php	(revision 5749)
+++ /mods/wpsg_mod_kundenverwaltung.class.php	(revision 5750)
@@ -116,4 +116,7 @@
 			
 			$this->shop->view['pages'] = $arPages;
+
+			$this->shop->view['arPageWithoutCreate'] = $arPages;
+			unset($this->shop->view['arPageWithoutCreate']['-1']);
 			
 			$this->shop->view['arRoles'] = get_option($wpdb->prefix."user_roles");
@@ -178,32 +181,11 @@
 		{
 						
-			if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'edit')
-			{
-				$this->be_editAction();
-			}
-			else if ($_REQUEST['action'] == 'add')
-			{
-				$this->be_addAction();
-			}
-			else if ($_REQUEST['action'] == 'export')
-			{
-				$this->be_exportAction();
-			}
-			else if ($_REQUEST['action'] == 'import')
-			{
-				$this->be_importAction();
-			}
-			else if ($_REQUEST['action'] == 'del')
-			{
-				$this->be_delAction();
-			}
-			else if ($_REQUEST['action'] == 'save')
-			{
-				$this->be_saveAction();
-			}
-			else
-			{
-				$this->be_indexAction();
-			}
+			if (wpsg_isSizedString($_REQUEST['action'], 'edit')) $this->be_editAction();
+			else if (wpsg_isSizedString($_REQUEST['action'], 'add')) $this->be_addAction();
+			else if (wpsg_isSizedString($_REQUEST['action'], 'export')) $this->be_exportAction();
+			else if (wpsg_isSizedString($_REQUEST['action'], 'import')) $this->be_importAction();
+			else if (wpsg_isSizedString($_REQUEST['action'], 'del')) $this->be_delAction();
+			else if (wpsg_isSizedString($_REQUEST['action'], 'save')) $this->be_saveAction();
+			else $this->be_indexAction();
 			
 		} // public function dispatch()
@@ -1640,5 +1622,40 @@
 		private function be_indexAction()
 		{
-						
+
+			$nPerPage = $this->shop->get_option('wpsg_mod_kundenverwaltung_perpage');
+			if ($nPerPage <= 0) $nPerPage = 10;
+
+			$this->shop->view['hasFilter'] = false;
+			$this->shop->view['arFilter'] = array(
+				'order' => 'cdate',
+				'ascdesc' => 'ASC',
+				'status' => '0',
+				'page' => '1'
+			);
+			$this->shop->view['arData'] = array();
+			$this->shop->view['pages'] = 1;
+
+			if (wpsg_isSizedArray($_REQUEST['filter'])) $this->shop->view['arFilter'] = $_REQUEST['filter'];
+			else if (wpsg_isSizedArray($_SESSION['wpsg']['backend']['customer']['arFilter'])) $this->shop->view['arFilter'] = $_SESSION['wpsg']['backend']['customer']['arFilter'];
+
+			$this->shop->view['countAll'] = wpsg_customer::count($this->shop->view['arFilter']);
+
+			if (wpsg_isSizedInt($_REQUEST['seite'])) $this->shop->view['arFilter']['page'] = $_REQUEST['seite'];
+
+			$this->shop->view['pages'] = ceil($this->shop->view['countAll'] / $nPerPage);
+			if ($this->shop->view['arFilter']['page'] <= 0 || $this->shop->view['arFilter']['page'] > $this->shop->view['pages']) $this->shop->view['arFilter']['page'] = 1;
+
+			$this->shop->view['arFilter']['limit'] = array(($this->shop->view['arFilter']['page'] - 1) * $nPerPage, $nPerPage);
+
+			// Filter speichern
+			$_SESSION['wpsg']['backend']['customer']['arFilter'] = $this->shop->view['arFilter'];
+
+			$this->shop->view['arData'] = wpsg_customer::find($this->shop->view['arFilter']);
+
+			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/index.phtml');
+
+			/*
+			$strQueryWHERE = '';
+
 			if (isset($_REQUEST['s']) && $_REQUEST['s'] != '')
 			{
@@ -1673,8 +1690,5 @@
 				
 			}
-			
-			// Damit "Geisterkungen" aus unvollstÀndigen Bestellungen nicht erscheinen
-			//$strQueryWHERE .= " AND K.`email` != '' ";
-			
+
 			$nPerPage = $this->shop->get_option('wpsg_mod_kundenverwaltung_perpage');
 			if ($nPerPage <= 0) $nPerPage = 10;
@@ -1765,5 +1779,5 @@
 			";
 			
-			$this->shop->view['data'] = $this->db->fetchAssoc($strQuery);  
+			$this->shop->view['arData'] = $this->db->fetchAssoc($strQuery);
 			 
 			// Kundengruppen laden
@@ -1782,15 +1796,16 @@
 			}
 
-			foreach ($this->shop->view['data'] as $k => $customer_db)
-			{
-
-				$this->shop->view['data'][$k]['oCustomer'] = new wpsg_customer();
-				$this->shop->view['data'][$k]['oCustomer']->load($customer_db['id']);
-				$this->shop->view['data'][$k]['order_umsatz'] = $this->shop->view['data'][$k]['oCustomer']->getOrderAmount(array(100, 110));
+			foreach ($this->shop->view['arData'] as $k => $customer_db)
+			{
+
+				$this->shop->view['arData'][$k]['oCustomer'] = new wpsg_customer();
+				$this->shop->view['arData'][$k]['oCustomer']->load($customer_db['id']);
+				$this->shop->view['arData'][$k]['order_umsatz'] = $this->shop->view['arData'][$k]['oCustomer']->getOrderAmount(array(100, 110));
 				
 			}
 			
 			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_kundenverwaltung/index.phtml');
-			
+			*/
+
 		} // private function be_indexAction()
 				
Index: /views/mods/mod_kundenverwaltung/index.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/index.phtml	(revision 5749)
+++ /views/mods/mod_kundenverwaltung/index.phtml	(revision 5750)
@@ -6,278 +6,160 @@
 
 ?>
-<script type="text/javascript">/* <![CDATA[ */
+<div class="wpsg_customer" id="wpsg-bs">
 
-	var wpsg_order = '<?php echo $this->view['filter']['order']; ?>';
-	var wpsg_ascdesc = '<?php echo $this->view['filter']['ascdesc']; ?>';
+    <nav class="navbar navbar-default">
 
-	function wpsg_setOrder(order)
-	{
-	
-		if (order == wpsg_order)
-		{
-	
-			// Nur Richtung Àndern
-			if (wpsg_ascdesc == 'asc') jQuery('#wpsg_ascdesc').val('desc');
-			else jQuery('#wpsg_ascdesc').val('asc');
-			
-		}
-		else
-		{
-	
-			jQuery('#wpsg_order').val(order);
-			jQuery('#wpsg_ascdesc').val('asc');
-			
-		}
-	
-		jQuery('#seite').val(1);
-		jQuery('#filter_form').submit();
-		
-		return false;
-		
-	} // function wpsg_setOrder(order)
-
-	jQuery(document).ready(function() {
-		
-		jQuery('.wpsg_handlediv').bind('click', function() {
-			
-			jQuery(this).next().toggle();
-
-			var arClose = new Array();
-			jQuery('.wpsg_customer_index .postbox .inside:hidden').each(function() {
-				arClose.push(jQuery(this).parent().attr("id"));
-			} );
-
-			jQuery.cookie('wpsg_customer_index_closed', arClose.join(','));
-			
-		} );
-
-		if (jQuery.cookie('wpsg_customer_index_closed') != null)
-		{
-
-			var arClose = jQuery.cookie('wpsg_customer_index_closed').split(',');
-
-			for (index in arClose)
-			{
-
-				if (arClose[index] != '') jQuery('#' + arClose[index] + ' .inside').hide();
-							
-			}
-			
-		}
-
-	} );
-		
-/* ]]> */</script>
-
-<div class="wrap wpsg_customer_index">
-	<nav class="navbar navbar-default">
 		<div class="container-fluid">
 			<div class="navbar-header">
-				<a class="navbar-brand" href="#"><?php echo __("wpShopGermany","wpsg"); ?></a>
+				<a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>
 			</div>
-			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-				<ul class="nav navbar-nav navbar-right">	
-					<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("HinzufÃŒgen", "wpsg"); ?></a></li>
-					<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'import'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=import&noheader=1"><span class="glyphicon glyphicon-import"></span><?php echo __("Import", "wpsg"); ?></a></li>
+			<div class="collapse navbar-collapse" id="bs-customer-navbar-collapse-1">
+				<ul class="nav navbar-nav">
+					<li role="presentation" class="wpsg-customer-tab-a active"><a href="#" onclick="return false;"><?php echo __("Kundenverwaltung", "wpsg"); ?></a></li>
+					<li role="presentation" class="wpsg-customer-tab-a wpsg_showhide_filter" id="wpsg-customer-tab-0"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
+                    <li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("HinzufÃŒgen", "wpsg"); ?></a></li>
+				</ul>
+				<ul class="nav navbar-nav navbar-right">
+                    <li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'import'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=import&noheader=1"><span class="glyphicon glyphicon-import"></span><?php echo __("Import", "wpsg"); ?></a></li>
 					<?php if (wpsg_isSizedArray($this->view['data'])) { ?>
-						<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'export'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=export&noheader=1"><span class="glyphicon glyphicon-export"></span><?php echo __("Export", "wpsg"); ?></a></li>
+					<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'export'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=export&noheader=1"><span class="glyphicon glyphicon-export"></span><?php echo __("Export", "wpsg"); ?></a></li>
 					<?php } ?>
 				</ul>
 			</div>
 		</div>
-		<div class="wpsg-filter container-fluid form-horizontal" style="display:<?php echo (($this->view['hasFilter'] === true)?'block':'none'); ?>;">
-			<div class="row">
+
+        <div class="wpsg-filter wpsg-customer-tab wpsg-customer-tab-0 container-fluid form-horizontal" style="display:<?php echo (($this->view['hasFilter'] === true)?'block':'none'); ?>;">
+            <div class="row">
 				<div class="col-lg-4">
 					<form method="post" id="filter_form">
+
 						<input id="wpsg_seite" type="hidden" name="seite" value="<?php echo $this->view['seite']; ?>" class="current-page" />
-						<input id="wpsg_ascdesc" type="hidden" name="search[ascdesc]" value="<?php echo $this->view['search']['ascdesc']; ?>/>
-						
+
+                        <input id="wpsg_order" type="hidden" name="search[order]" value="<?php echo $this->view['search']['order']; ?>" />
+						<input id="wpsg_ascdesc" type="hidden" name="search[ascdesc]" value="<?php echo $this->view['search']['ascdesc']; ?>" />
+
 						<?php echo wpsg_drawForm_Input('s', __('Suchfeld', 'wpsg'), wpsg_getStr($_REQUEST['s'])); ?>
-						<?php echo wpsg_drawForm_SubmitButton(__("Kundedaten suchen", "wpsg")); ?>
+
+						<?php echo wpsg_drawForm_SubmitButton(__('Produkte suchen')); ?><br />
+
 					</form>
 				</div>
 			</div>
-		</div>
-	</nav>
+        </div>
+
+    </nav>
+
+    <?php if ($this->view['pages'] > 1) { ?>
+        <nav class="pagination_wrap">
+            <ul class="pagination">
+                <?php if ($this->view['arFilter']['page'] > 1) { ?>
+                    <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true">&laquo;</span></a></li>
+                <?php } ?>
+                <?php for ($i = 1; $i <= $this->view['pages']; $i ++) { ?>
+                    <li class="<?php echo (($i == $this->view['arFilter']['page'])?'active':''); ?>"><a onclick="return goPage(<?php echo $i; ?>);" href="#"><?php echo $i; ?></a></li>
+                <?php } ?>
+                <?php if ($this->view['arFilter']['page'] + 1 <= $this->view['pages']) { ?>
+                    <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('NÀchste Seite'); ?>"><span aria-hidden="true">&raquo;</span></a></li>
+                <?php } ?>
+            </ul>
+        </nav>
+	<?php } ?>
+
+	<div class="wpsg_clear"></div>
+
 	<?php echo $this->writeBackendMessage(); ?>
-		
-	<form method="POST" id="filter_form">
-		
-		<?php if ($this->hasMod('wpsg_mod_customergroup')) { ?>
-		<select style="float:left;" name="customergroup" onchange="jQuery('#filter_form').submit();">
-			<option value="-1"><?php echo __('Alle Kundengruppen', 'wpsg'); ?></option>
-			<option value="0" <?php echo (($_REQUEST['customergroup'] === '0')?'selected="selected"':''); ?>><?php echo __('Unzugeordnet', 'wpsg'); ?></option>
-			<?php foreach ((array)$this->view['arCustomergroup'] as $customer_group_id => $customer_group_name) { ?>
-			<option value="<?php echo $customer_group_id; ?>" <?php echo (($customer_group_id == $_REQUEST['customergroup'])?'selected="selected"':''); ?>><?php echo $customer_group_name; ?></option>
-			<?php } ?>
-		</select>
-		<?php } ?>
-	
-		<p class="search-box">
-			<label for="post-search-input" class="screen-reader-text"><?php echo __('Kunden suchen', 'wpsg'); ?>:</label>
-			<input type="text" value="<?php echo wpsg_hspc($_REQUEST['s']); ?>" name="s" id="post-search-input">
-			<input type="submit" value="<?php echo __('Kunden suchen', 'wpsg'); ?>" class="button" id="search-submit" name="">
-		</p>
-				
-		<div class="tablenav top">
-		
-			<?php if (sizeof($this->view['data'] > 0)) { ?>
-			<div class="tablenav-pages"><span class="displaying-num"><?php echo wpsg_translate(__('#1# Elemente', 'wpsg'), $this->view['count']); ?></span>
-				<div class="tablenav-pages">	
-					<span class="pagination-links">
-						<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;seite=1&amp;s=<?php echo $_REQUEST['s']; ?>" title="<?php echo __('Zur ersten Seite gehen', 'wpsg'); ?>" class="first-page <?php echo (($this->view['seite'] == '1')?'disabled':''); ?>">«</a>
-						<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;seite=<?php echo $this->view['seite'] - 1; ?>" title="<?php echo __('Zur vorherigen Seite gehen', 'wpsg'); ?>" class="prev-page <?php echo (($this->view['seite'] <= 1)?'disabled':''); ?>">‹</a>
-						<span class="paging-input"><input type="text" size="1" value="<?php echo $this->view['seite']; ?>" name="seite" title="<?php echo __('Aktuelle Seite', 'wpsg'); ?>" class="current-page"> <?php echo __('von', 'wpsg'); ?> <span class="total-pages"><?php echo $this->view['pages']; ?></span></span>
-						<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;seite=<?php echo $this->view['seite'] + 1; ?>" title="<?php echo __('Zur nÀchsten Seite gehen', 'wpsg'); ?>" class="next-page <?php echo (($this->view['seite'] >= $this->view['pages'])?'disabled':''); ?>">›</a>
-						<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;seite=<?php echo $this->view['pages']; ?>" title="<?php echo __('Zur letzten Seite gehen', 'wpsg'); ?>" class="last-page <?php echo (($this->view['seite'] == $this->view['pages'])?'disabled':''); ?>">»</a>
-					</span>
-				</div>
-				
-				<script type="text/javascript">
 
-					jQuery('.tablenav-pages .disabled').bind('click', function() { return false; } );
-				
-				</script>
-				
-				<br class="clear" />
-			</div>
-			<?php } ?>
-		
-		</div>
-		
-		<input id="wpsg_order" type="hidden" name="filter[order]" value="<?php echo $this->view['filter']['order']; ?>" />
-		<input id="wpsg_ascdesc" type="hidden" name="filter[ascdesc]" value="<?php echo $this->view['filter']['ascdesc']; ?>" />
-		
-		<input style="display:none;" type="submit" name="suchen" value="" />
-		
-		<?php $this->callMods('wpsg_mod_customer_head'); ?>
-		
-		<?php if (is_array($this->view['data']) && sizeof($this->view['data']) > 0) { ?>
-		<table class="widefat post fixed">
-			<thead>
-				<tr>
-					<th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'nr')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>" style="width:60px;">
-						<a href="#" onclick="return wpsg_setOrder('nr');">
-							<span><?php echo __("Nr.", 'wpsg'); ?></span>
-							<span class="sorting-indicator"></span>
-						</a>
-					</th>
-					<th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'name')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>">
-						<a href="#" onclick="return wpsg_setOrder('name');">
-							<span><?php echo __("Name", 'wpsg'); ?></span>
-							<span class="sorting-indicator"></span>
-						</a>
-					</th>
-					<th class="manage-column column-adress <?php echo (($this->view['filter']['order'] == 'adress')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>">
-						<a href="#" onclick="return wpsg_setOrder('adress');">
-							<span><?php echo __("Anschrift", 'wpsg'); ?></span>
-							<span class="sorting-indicator"></span>
-						</a>
-					</th>
-					<th class="manage-column column-status <?php echo (($this->view['filter']['order'] == 'status')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>">
-						<a href="#" onclick="return wpsg_setOrder('status');">
-							<span><?php echo __("Status", 'wpsg'); ?></span>
-							<span class="sorting-indicator"></span>
-						</a>
-					</th>				
-				</tr>
-			</thead>
-			<tbody>
-				<?php foreach ($this->view['data'] as $k) { ?>
-				<tr>
-					<td class="manage-column column-title">
-						<?php echo ((strlen($k['knr']) > 0)?$k['knr']:$k['id']); ?>						
-					</td>
-					<td class="manage-column column-title">
-						<strong>&nbsp;<?php echo wpsg_hspc((trim($k['vname'].' '.$k['name']) == "")?__("---- ", "wpsg"):$k['vname'].' '.$k['name']); ?>&nbsp;<a href="mailto:<?php echo wpsg_hspc($k['email']); ?>" style="font-weight:normal;">(<?php echo wpsg_hspc($k['email']); ?>)</a></strong>
-					</td>
-					<td rowspan="2" class="manage-column column-adress">						
-						<?php echo (($k['firma'] != '')?$k['firma']:'').'<br />'; ?>
-						<?php echo isset($this->$k['strasse']) && $k['strasse'].' '.isset ($this->$k['hausnr']) && $k['hausnr']; ?><br />
-						<?php echo $k['plz'].' '.$k['ort'].' '.$k['land_kuerzel']; ?><br />
-					</td>
-					<td rowspan="2" class="manage-column column-status">
-						<?php echo wpsg_translate(__('#1# Bestellungen', 'wpsg'), $k['order_count']); ?><br />
-						<?php echo wpsg_translate(__('Umsatz: #1#', 'wpsg'), wpsg_ff($k['order_umsatz'], $this->get_option('wpsg_currency'))); ?>
-						<?php if ($k['order_count'] > 0) { ?>
-						<br />
-						<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter%5Bk_id%5D=<?php echo $k['id']; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a>
-						<?php } ?>
-					</td>
-				</tr>
-				<tr>
-					<td class="manage-column wpsg-row-actions" colspan="2">
-						<div>
-							<span class="edit"><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;action=edit&amp;edit_id=<?php echo $k['id']; ?>"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>
-							|
-							<span class="del"><a onclick="if (!confirm('<?php echo __("Sind Sie sicher, dass Sie diesen Kunden löschen wollen?", "wpsg"); ?>')) return false;" title="<?php echo __("Diesen Kunden löschen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;action=del&amp;edit_id=<?php echo $k['id']; ?>&amp;noheader=1"><?php echo __("Löschen", "wpsg"); ?></a></span>
-							<?php if ($k['order_count'] > 0) { ?>
-							|
-							<span class="order"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter%5Bk_id%5D=<?php echo $k['id']; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a></span>
-							<?php } ?>						
-						</div>
-					</td>
-				</tr>
-				<?php } ?>
-			</tbody>
-			<tfoot>
-				<tr>
-					<th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'nr')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>">
-						<a href="#" onclick="return wpsg_setOrder('nr');">
-							<span><?php echo __("Nr.", 'wpsg'); ?></span>
-							<span class="sorting-indicator"></span>
-						</a>
-					</th>
-					<th class="manage-column column-title <?php echo (($this->view['filter']['order'] == 'name')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>">
-						<a href="#" onclick="return wpsg_setOrder('name');">
-							<span><?php echo __("Name", 'wpsg'); ?></span>
-							<span class="sorting-indicator"></span>
-						</a>
-					</th>
-					<th class="manage-column column-adress <?php echo (($this->view['filter']['order'] == 'adress')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>">
-						<a href="#" onclick="return wpsg_setOrder('adress');">
-							<span><?php echo __("Anschrift", 'wpsg'); ?></span>
-							<span class="sorting-indicator"></span>
-						</a>
-					</th>
-					<th class="manage-column column-status <?php echo (($this->view['filter']['order'] == 'status')?'sorted':'sortable'); ?> <?php echo (($this->view['filter']['ascdesc'] == 'asc')?'asc':'desc'); ?>">
-						<a href="#" onclick="return wpsg_setOrder('status');">
-							<span><?php echo __("Status", 'wpsg'); ?></span>
-							<span class="sorting-indicator"></span>
-						</a>
-					</th>				
-				</tr>
-			</tfoot>
-		</table>
-		
-			<?php /* if (sizeof($this->view['data'] > 0)) { ?>
-			<div class="tablenav">
-				<div class="tablenav-pages"><span class="displaying-num"><?php echo wpsg_translate(__('#1# Elemente', 'wpsg'), $this->view['count']); ?></span>
-					<div class="tablenav-pages">	
-						<span class="pagination-links">
-							<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;seite=1&amp;s=<?php echo $_REQUEST['s']; ?>" title="<?php echo __('Zur ersten Seite gehen', 'wpsg'); ?>" class="first-page <?php echo (($this->view['seite'] == '1')?'disabled':''); ?>">«</a>
-							<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;seite=<?php echo $this->view['seite'] - 1; ?>" title="<?php echo __('Zur vorherigen Seite gehen', 'wpsg'); ?>" class="prev-page <?php echo (($this->view['seite'] <= 1)?'disabled':''); ?>">‹</a>
-							<span class="paging-input"><input type="text" size="1" value="<?php echo $this->view['seite']; ?>" name="seite" title="<?php echo __('Aktuelle Seite', 'wpsg'); ?>" class="current-page"> <?php echo __('von', 'wpsg'); ?> <span class="total-pages"><?php echo $this->view['pages']; ?></span></span>
-							<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;seite=<?php echo $this->view['seite'] + 1; ?>" title="<?php echo __('Zur nÀchsten Seite gehen', 'wpsg'); ?>" class="next-page <?php echo (($this->view['seite'] >= $this->view['pages'])?'disabled':''); ?>">›</a>
-							<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;seite=<?php echo $this->view['pages']; ?>" title="<?php echo __('Zur letzten Seite gehen', 'wpsg'); ?>" class="last-page <?php echo (($this->view['seite'] == $this->view['pages'])?'disabled':''); ?>">»</a>
-						</span>
-					</div>
-					
-					<script type="text/javascript">
-			
-						jQuery('.tablenav-pages .disabled').bind('click', function() { return false; } );
-					
-					</script>
-					
-					<br class="clear">
-				</div>
-			</div>
-			<?php } */ ?>
-			
-		<?php } else { ?>
-		<p><?php echo __('Keine Kunden in der Datenbank.', 'wpsg'); ?></p>
-		<?php } ?>
-		
-	</form>
-	
+	<div class="content">
+
+        <?php if (is_array($this->view['arData']) && sizeof($this->view['arData']) > 0) { ?>
+
+            <table class="table wpsg-table-order table-bordered table-hover table-striped wpsg-table-customer">
+                <thead>
+                    <tr>
+                        <th class="manage-column column-title wpsg_pic_col"></th>
+                        <th class="wpsg_order col_name" data-order="name"><?php echo __("Name", 'wpsg'); ?></th>
+                        <th class="wpsg_order col_adress" data-order="adress"><?php echo __("Anschrift", 'wpsg'); ?></th>
+                        <th class="wpsg_order col_status" data-order="status"><?php echo __("Status", 'wpsg'); ?></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($this->view['arData'] as $c) { ?>
+                    <tr>
+                        <td class="wpsg_pic_col">
+
+                        </td>
+                        <td class="col_name column-title">
+                            <strong><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>" class="row-title"><?php echo $c->getLabel(); ?></a></strong>
+                            <?php if (strlen($c->getEMail()) > 0) { ?>
+                                <a href="mailto:<?php echo $c->getEMail(); ?>" title="<?php echo __('Dem Kunden eine E-Mail schreiben.', 'wpsg'); ?>"><?php echo $c->getEMail();  ?></a>
+                            <?php } ?>
+                            <div class="row-actions">
+                                <span class="edit"><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>&noheader=1"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>
+                                |
+                                <span class="del"><a onclick="if (!confirm('<?php echo __("Sind Sie sicher, dass Sie den Kunden löschen wollen?", "wpsg"); ?>')) return false;" title="<?php echo __("Diesen Kunden löschen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=del&edit_id=<?php echo $c->id; ?>&noheader=1"><?php echo __("Löschen", "wpsg"); ?></a></span>
+                                |
+                                <span class="order"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter%5Bk_id%5D=<?php echo $k['id']; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a></span>
+                            </div>
+                        </td>
+                        <td class="col_adress">
+                            <?php echo ((strlen($c->getCompany()) > 0)?$c->getCompany().'<br />':''); ?>
+                            <?php echo $c->getStreet(); ?><br />
+                            <?php echo trim($c->getZip().' '.$c->getCity()); ?>
+                            <?php /*echo $c->plz.' '.$c->ort.' '.$c->land_kuerzel; */?><br />
+                        </td>
+                        <td class="col_status">
+                            <?php echo wpsg_translate(__('#1# Bestellungen', 'wpsg'), $c->getOrderCount()); ?><br />
+                            <?php echo wpsg_translate(__('Umsatz: #1#', 'wpsg'), wpsg_ff($c->getOrderAmount(), $this->get_option('wpsg_currency'))); ?>
+                            <?php if ($c->getOrderCount() > 0) { ?>
+                            <br />
+                            <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter[k_id]=<?php echo $c->id; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a>
+                            <?php } ?>
+                        </td>
+                    </tr>
+                    <?php } ?>
+                </tbody>
+            </table>
+
+            <?php if ($this->view['pages'] > 1) { ?>
+                <nav class="pagination_wrap pagination_wrap_bottom">
+                    <ul class="pagination">
+                        <?php if ($this->view['arFilter']['page'] > 1) { ?>
+                            <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] - 1; ?>);" href="#" aria-label="<?php echo __('Vorherige Seite'); ?>"><span aria-hidden="true">&laquo;</span></a></li>
+                        <?php } ?>
+                        <?php for ($i = 1; $i <= $this->view['pages']; $i ++) { ?>
+                            <li class="<?php echo (($i == $this->view['arFilter']['page'])?'active':''); ?>"><a onclick="return goPage(<?php echo $i; ?>);" href="#"><?php echo $i; ?></a></li>
+                        <?php } ?>
+                        <?php if ($this->view['arFilter']['page'] + 1 <= $this->view['pages']) { ?>
+                            <li><a onclick="return goPage(<?php echo $this->view['arFilter']['page'] + 1; ?>);" href="#" aria-label="<?php echo __('NÀchste Seite'); ?>"><span aria-hidden="true">&raquo;</span></a></li>
+                        <?php } ?>
+                    </ul>
+                </nav>
+            <?php } ?>
+
+        <?php } else { ?>
+        <p><?php echo __('Es wurden keine Kunden in der Datenbank gefunden.', 'wpsg'); ?></p>
+        <?php } ?>
+
+    </div>
+
 </div>
+<?php wpsg_debug($this->view['search']); ?>
+<script type="text/javascript">/* <![CDATA[ */
+
+    <?php if (wpsg_isSizedString($this->view['search']['order']) && wpsg_isSizedString($this->view['search']['ascdesc'])) { ?>
+    jQuery('th[data-order="<?php echo $this->view['search']['order']; ?>"]').addClass('wpsg_order_<?php echo strtolower($this->view['search']['ascdesc']); ?>');
+    <?php } ?>
+
+	function goPage(page)
+	{
+
+		if (page <= 0 || page == <?php echo $this->view['seite']; ?> || page > <?php echo $this->view['pages']; ?>) return;
+
+		jQuery('#wpsg_seite').val(page);
+		jQuery('#filter_form').submit();
+
+		return false;
+
+	} // function goPage(page)
+
+/* ]]> */</script>
Index: /views/mods/mod_kundenverwaltung/settings_edit.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/settings_edit.phtml	(revision 5749)
+++ /views/mods/mod_kundenverwaltung/settings_edit.phtml	(revision 5750)
@@ -7,4 +7,7 @@
 ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_kundenverwaltung_perpage', __('Kunden pro Seite (Backend)', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_perpage'), array('help' => 'wpsg_mod_kundenverwaltung_perpage')); ?>
+
+<br />
+
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_showCheckoutLogin', __('Login in Checkout integrieren', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_showCheckoutLogin'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutLogin')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_showCheckoutRegister', __('Registrierung im Checkout', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_showCheckoutRegister'), array('help' => 'wpsg_mod_kundenverwaltung_showCheckoutRegister')); ?>
@@ -13,11 +16,13 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_preisAnzeige', __('Bestellung nur fÃŒr eingeloggte Benutzer', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige'), array('help' => 'wpsg_mod_kundenverwaltung_preisAnzeige')); ?>
 
+<br />
+
 <?php echo wpsg_drawForm_Select('wpsg_mod_kundenverwaltung_redirectlogin', __('Weiterleitung nach Login', 'wpsg'), wpsg_array_merge(array(	
 	'0' => __('Auf aktueller Seite bleiben', 'wpsg')		
-), $arPageWithoutCreate), $this->get_option('wpsg_mod_kundenverwaltung_redirectlogin'), array('help' => 'wpsg_mod_kundenverwaltung_redirectlogin')); ?>
+), $this->view['arPageWithoutCreate']), $this->get_option('wpsg_mod_kundenverwaltung_redirectlogin'), array('help' => 'wpsg_mod_kundenverwaltung_redirectlogin')); ?>
 
 <?php echo wpsg_drawForm_Select('wpsg_mod_kundenverwaltung_redirectLogout', __('Weiterleitung nach Logout', 'wpsg'), wpsg_array_merge(array(	
 	'0' => __('Auf aktueller Seite bleiben', 'wpsg')		
-), $arPageWithoutCreate), $this->get_option('wpsg_mod_kundenverwaltung_redirectLogout'), array('help' => 'wpsg_mod_kundenverwaltung_redirectLogout')); ?>
+), $this->view['arPageWithoutCreate']), $this->get_option('wpsg_mod_kundenverwaltung_redirectLogout'), array('help' => 'wpsg_mod_kundenverwaltung_redirectLogout')); ?>
 
 <?php echo wpsg_drawForm_Select('wpsg_page_mod_kundenverwaltung_status', __('Status nach Registrierung', 'wpsg'), array('inaktiv', 'aktiv'), $this->get_option('wpsg_page_mod_kundenverwaltung_status'), array('help' => 'wpsg_mod_kundenverwaltung_status')); ?>
@@ -27,6 +32,6 @@
 	</div>
 	<div class="wpsg_form_right">
-		<a onclick="if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie alle Kunden auf Aktiv setzen möchten?', 'wpsg'); ?>')) return false;" style="float:left;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_kundenverwaltung&wpsg_mod_kundenverwaltung_setActiv=1&noheader=1"><?php echo __('Alle Kunden auf Aktiv setzen.', 'wpsg'); ?></a>
-		<a onclick="if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie alle Kunden auf Inaktiv setzen möchten?', 'wpsg'); ?>')) return false;" style="float:right; margin-right:25px;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_kundenverwaltung&wpsg_mod_kundenverwaltung_setInactiv=1&noheader=1"><?php echo __('Alle Kunden auf Inaktiv setzen.', 'wpsg'); ?></a>
+		<a onclick="if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie alle Kunden auf Aktiv setzen möchten?', 'wpsg'); ?>')) return false;" style="float:left;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_kundenverwaltung&wpsg_mod_kundenverwaltung_setActiv=1&noheader=1"><?php echo __('Alle Kunden aktivieren', 'wpsg'); ?></a>
+		<a onclick="if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie alle Kunden auf Inaktiv setzen möchten?', 'wpsg'); ?>')) return false;" style="float:right; margin-right:25px;" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_kundenverwaltung&wpsg_mod_kundenverwaltung_setInactiv=1&noheader=1"><?php echo __('Alle Kunden deaktivieren', 'wpsg'); ?></a>
 	</div>
 	<div class="wpsg_clear"></div>
@@ -47,5 +52,4 @@
 </div>
 
-<br />
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_kundenverwaltung_aweber', __('AWeber Integration', 'wpsg'), $this->get_option('wpsg_mod_kundenverwaltung_aweber'), array('help' => 'wpsg_mod_kundenverwaltung_aweber')); ?>
 <div id="wpsg_mod_kundenverwaltung_aweber_layer" style="display:none;">
@@ -58,5 +62,5 @@
 
 <br />
-<div class="wpsg_hinweis">
+<div class="info">
 	<?php echo wpsg_translate(__('Die Einstellungen fÌr die E-Mails (Betreff, Absender, CC) können in der <a href="#1#">E-Mail Konfiguration</a> durchgefÌhrt werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf'); ?>
 </div>