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

2 files changed, 80 insertions, 21 deletions

diff --git a/views/mods/mod_gutschein/index.phtml b/views/mods/mod_gutschein/index.phtml
index f928462..03518d2 100644
--- a/views/mods/mod_gutschein/index.phtml
+++ b/views/mods/mod_gutschein/index.phtml
@@ -5,16 +5,8 @@
 	 */

 

 ?>

-<div class="wrap wpsg_mod_gutschein">

-	<div class="icon32 icon32-posts-post" id="icon-edit"><br></div>

-	<h2>

-		<?php echo __('Gutscheinverwaltung', 'wpsg'); ?>			

-		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&amp;action=add" class="add-new-h2"><?php echo __("Hinzufügen", "wpsg"); ?></a>

-		<a href="#" onclick="return wpsg_doExport();" class="add-new-h2"><?php echo __('CSV Export', 'wpsg'); ?></a>

-		<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[ */

+

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

 

 		var wpsg_order = '<?php echo $this->view['filter']['order']; ?>';

 		var wpsg_ascdesc = '<?php echo $this->view['filter']['ascdesc']; ?>';

@@ -91,6 +83,54 @@
 		

 	/* ]]> */</script>

 

+<div class="wrap wpsg_mod_gutschein">

+	<?php /*?>

+	<div class="icon32 icon32-posts-post" id="icon-edit"><br></div>

+	<h2>

+		<?php echo __('Gutscheinverwaltung', 'wpsg'); ?>			

+		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&amp;action=add" class="add-new-h2"><?php echo __("Hinzufügen", "wpsg"); ?></a>

+		<a href="#" onclick="return wpsg_doExport();" class="add-new-h2"><?php echo __('CSV Export', 'wpsg'); ?></a>

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

+	<?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(); ?>

 	

 	<form method="POST" id="filter_form" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher">

@@ -299,7 +339,7 @@
 			</div>

 		</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 { ?>

 		<p><?php echo __('Keine Gutscheine in der Datenbank.', 'wpsg'); ?></p>					

diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml
index a8753e4..55dc362 100644
--- a/views/mods/mod_kundenverwaltung/index.phtml
+++ b/views/mods/mod_kundenverwaltung/index.phtml
@@ -70,16 +70,35 @@
 /* ]]> */</script>

 

 <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(); ?>

 		

 	<form method="POST" id="filter_form">