Index: /views/mods/mod_gutschein/index.phtml
===================================================================
--- /views/mods/mod_gutschein/index.phtml	(revision 5551)
+++ /views/mods/mod_gutschein/index.phtml	(revision 5552)
@@ -6,5 +6,84 @@
 
 ?>
+
+<script type="text/javascript">/* <![CDATA[ */
+
+		var wpsg_order = '<?php echo $this->view['filter']['order']; ?>';
+		var wpsg_ascdesc = '<?php echo $this->view['filter']['ascdesc']; ?>';
+    	
+		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)
+    
+		function goPage(page)
+		{
+
+			if (page <= 0 || page == <?php echo $this->view['page']; ?> || page > <?php echo $this->view['pages']; ?>) return;			
+			
+			jQuery('#seite').val(page);
+			
+			jQuery('#filter_form').submit();
+
+			return false;
+			
+		} // function goPage(page)
+
+		function goStatus(status)
+		{
+
+			jQuery('#status').val(status);
+			jQuery('#seite').val('1');
+
+			jQuery('#filter_form').submit();
+
+			return false;
+			
+		} // public function goStatus(status)
+
+		function wpsg_doExport()
+		{
+
+			var action_alt = jQuery('#filter_form').attr('action'); 
+
+			jQuery('#wpsg_voucher_export').val('1');
+			jQuery('#filter_form').attr('target', '_blank');
+			jQuery('#filter_form').attr('action', jQuery('#filter_form').attr('action') + '&noheader=1');
+			
+			jQuery('#filter_form').submit();			
+
+			jQuery('#filter_form').attr('action', action_alt);
+			jQuery('#filter_form').attr('target', '');
+			jQuery('#wpsg_voucher_export').val('0');
+
+			return false;
+			
+		} // function wpsg_doExport()
+		
+	/* ]]> */</script>
+
 <div class="wrap wpsg_mod_gutschein">
+	<?php /*?>
 	<div class="icon32 icon32-posts-post" id="icon-edit"><br></div>
 	<h2>
@@ -14,82 +93,43 @@
 		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&amp;action=import" class="add-new-h2"><?php echo __('CSV Import', 'wpsg'); ?></a>
 	</h2>
-	
-	<script type="text/javascript">/* <![CDATA[ */
-
-		var wpsg_order = '<?php echo $this->view['filter']['order']; ?>';
-		var wpsg_ascdesc = '<?php echo $this->view['filter']['ascdesc']; ?>';
-    	
-		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)
-    
-		function goPage(page)
-		{
-
-			if (page <= 0 || page == <?php echo $this->view['page']; ?> || page > <?php echo $this->view['pages']; ?>) return;			
-			
-			jQuery('#seite').val(page);
-			
-			jQuery('#filter_form').submit();
-
-			return false;
-			
-		} // function goPage(page)
-
-		function goStatus(status)
-		{
-
-			jQuery('#status').val(status);
-			jQuery('#seite').val('1');
-
-			jQuery('#filter_form').submit();
-
-			return false;
-			
-		} // public function goStatus(status)
-
-		function wpsg_doExport()
-		{
-
-			var action_alt = jQuery('#filter_form').attr('action'); 
-
-			jQuery('#wpsg_voucher_export').val('1');
-			jQuery('#filter_form').attr('target', '_blank');
-			jQuery('#filter_form').attr('action', jQuery('#filter_form').attr('action') + '&noheader=1');
-			
-			jQuery('#filter_form').submit();			
-
-			jQuery('#filter_form').attr('action', action_alt);
-			jQuery('#filter_form').attr('target', '');
-			jQuery('#wpsg_voucher_export').val('0');
-
-			return false;
-			
-		} // function wpsg_doExport()
-		
-	/* ]]> */</script>
-
+	<?php */ ?>
+	
+	<nav class="navbar navbar-default">
+		<div class="container-fluid">
+			<div class="navbar-header">
+				<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">
+					<li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt"><?php echo __("Gutscheinverwaltung", "wpsg"); ?></a></li>
+					<li role="presentation" class="wpsg_showhide_filter <?php echo (($this->view['hasFilter'] === true)?'active':''); ?>"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Gutscheinsuche", "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-Produkt&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-Produkt&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>
+					<?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="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']; ?>" />
+										
+						<?php echo wpsg_drawForm_Input('s', __('Suchfeld', 'wpsg'), wpsg_getStr($_REQUEST['s'])); ?>
+						
+						<?php echo wpsg_drawForm_SubmitButton(__('Gutschein suchen')); ?>
+						
+					</form>				
+				</div>
+			</div>		
+		</div>
+	</nav> 
+	
 	<?php echo $this->writeBackendMessage(); ?>
 	
@@ -300,5 +340,5 @@
 		</div>
 	  	  
-		<input class="button-primary" type="submit" onclick="if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false;" name="wpshopgermany-submit-gs_del" value="<?php echo __("Markierte löschen", "wpsg"); ?>" />&nbsp;
+		<input class="button-primary" type="submit" onclick="if (!confirm('<?php echo __('Sind Sie sich sicher?', 'wpsg'); ?>')) return false;" name="wpshopgermany-submit-gs_del" value="<?php echo __("alle markierten Gutscheine löschen", "wpsg"); ?>" />&nbsp;
 		<br /><br />		
 		<?php } else { ?>
Index: /views/mods/mod_kundenverwaltung/index.phtml
===================================================================
--- /views/mods/mod_kundenverwaltung/index.phtml	(revision 5551)
+++ /views/mods/mod_kundenverwaltung/index.phtml	(revision 5552)
@@ -71,14 +71,33 @@
 
 <div class="wrap wpsg_customer_index">
-	<div class="icon32 icon32-posts-post" id="icon-edit"><br /></div>
-	<h2>
-		<?php echo __('Kundenverwaltung', 'wpsg'); ?>		
-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;action=add" class="add-new-h2"><?php echo __("HinzufÃŒgen", "wpsg"); ?></a>
-		<?php if (wpsg_isSizedArray($this->view['data'])) { ?>
-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;action=export&amp;noheader=1" class="add-new-h2"><?php echo __('Exportieren', 'wpsg'); ?></a>
-		<?php } ?>
-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&amp;action=import" class="add-new-h2"><?php echo __('Importieren', 'wpsg'); ?></a>
-	</h2>
-
+	<nav class="navbar navbar-default">
+		<div class="container-fluid">
+			<div class="navbar-header">
+				<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>
+					<?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>
+					<?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="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']; ?>/>
+						
+						<?php echo wpsg_drawForm_Input('s', __('Suchfeld', 'wpsg'), wpsg_getStr($_REQUEST['s'])); ?>
+						<?php echo wpsg_drawForm_SubmitButton(__("Kundedaten suchen", "wpsg")); ?>
+					</form>
+				</div>
+			</div>
+		</div>
+	</nav>
 	<?php echo $this->writeBackendMessage(); ?>