From 703a450908599b3ebc8018f41f54e510bb0dc255 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 4 Mar 2016 21:04:26 +0000
Subject: - Übernahme neuer Funktionen aus dem alten Zweig / Pfad /
 Einstellungen / Hilfe Icons / Berechnung - Neuer Modulfilter im neuen Backend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5382 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/customerpreset.phtml |  8 ++--
 views/admin/extended.phtml       | 21 +++++-----
 views/admin/form/checkbox.phtml  |  2 +-
 views/admin/form/input.phtml     |  4 +-
 views/admin/form/select.phtml    |  4 +-
 views/admin/form/text.phtml      |  4 +-
 views/admin/includes.phtml       |  6 +--
 views/admin/index.phtml          |  6 +--
 views/admin/konfiguration.phtml  | 16 +++-----
 views/admin/module.phtml         | 87 +++++++++++++++++++++++++++++++---------
 10 files changed, 102 insertions(+), 56 deletions(-)

(limited to 'views/admin')

diff --git a/views/admin/customerpreset.phtml b/views/admin/customerpreset.phtml
index 4f8fab1..128c2ac 100644
--- a/views/admin/customerpreset.phtml
+++ b/views/admin/customerpreset.phtml
@@ -24,12 +24,12 @@
 	
 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;noheader=1&amp;subaction=<?php echo $_REQUEST['subaction']; ?>">
 
-		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_shipping', __('Standard Versandart', 'wpsg'), $this->view['arShipping'], $this->get_option('wpsg_customerpreset_shipping')); ?>
-		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_payment', __('Standard Zahlungsart', 'wpsg'), $this->view['arPayment'], $this->get_option('wpsg_customerpreset_payment')); ?>
-		<?php echo wpsg_drawForm_Select('wpsg_defaultland', __('Standardland', 'wpsg'), $this->view['arLander'], $this->get_option('wpsg_defaultland'), array('hint' => 
+		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_shipping', __('Standard Versandart', 'wpsg'), $this->view['arShipping'], $this->get_option('wpsg_customerpreset_shipping'), array('help' => 'wpsg_customerpreset_shipping')); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_payment', __('Standard Zahlungsart', 'wpsg'), $this->view['arPayment'], $this->get_option('wpsg_customerpreset_payment'), array('help' => 'wpsg_customerpreset_payment')); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_defaultland', __('Standardland', 'wpsg'), $this->view['arLander'], $this->get_option('wpsg_defaultland'), array('help' => 'wpsg_defaultland', 'hint' => 
 			'nohspc_'.wpsg_translate(__('Die Länder können in der <a href="#1#">Länderverwaltung</a> definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=laender')		
 		)); ?>
-		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_title', __('Standardanrede', 'wpsg'), $this->view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array(
+		<?php echo wpsg_drawForm_Select('wpsg_customerpreset_title', __('Standardanrede', 'wpsg'), $this->view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array( 'help' => 'wpsg_customerpreset_title',
 			'hint' => 'nohspc_'.wpsg_translate(__('Die Auswahl kann in den <a href="#1#">Kundendaten</a> definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten'),
 			'noIndex' => true 
 		)); ?>
diff --git a/views/admin/extended.phtml b/views/admin/extended.phtml
index 235143a..d97320b 100644
--- a/views/admin/extended.phtml
+++ b/views/admin/extended.phtml
@@ -24,25 +24,26 @@
 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=extended&noheader=1'); ?>">
 	
 		<?php echo wpsg_drawForm_Input('wpsg_salt', __('SALT Schlüssel', 'wpsg'), $this->get_option('wpsg_salt')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_options_nl2br', __('RTE Felder mit nl2br speichern', 'wpsg'), $this->get_option('wpsg_options_nl2br')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_debugModus', __('Debug Modus', 'wpsg'), $this->get_option('wpsg_debugModus')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_options_nl2br', __('RTE Felder mit nl2br speichern', 'wpsg'), $this->get_option('wpsg_options_nl2br'), array('help' => 'wpsg_options_nl2br')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_debugModus', __('Debug Modus', 'wpsg'), $this->get_option('wpsg_debugModus'), array('help' => 'wpsg_debugModus')); ?>
 		
 		<?php if ($this->hasMod('wpsg_mod_core')) { ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_debugURL', __('Beta Updates laden', 'wpsg'), $this->get_option('wpsg_debugURL')); ?>				
+		<?php echo wpsg_drawForm_Checkbox('wpsg_debugURL', __('Beta Updates laden', 'wpsg'), $this->get_option('wpsg_debugURL'), array('help' => 'wpsg_debugURL')); ?>				
 		<?php } ?>
 		
-		<?php echo wpsg_drawForm_Checkbox('wpsg_referer_requesturi', __('RequestURI als ProduktURL verwenden', 'wpsg'), $this->get_option('wpsg_referer_requesturi')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_ignoreuserview', __('User Views ignorieren', 'wpsg'), $this->get_option('wpsg_ignoreuserview')); ?>		
+		<?php echo wpsg_drawForm_Checkbox('wpsg_referer_requesturi', __('RequestURI als ProduktURL verwenden', 'wpsg'), $this->get_option('wpsg_referer_requesturi'), array('help' => 'wpsg_referer_requesturi')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_ignoreuserview', __('User Views ignorieren', 'wpsg'), $this->get_option('wpsg_ignoreuserview'), array('help' => 'wpsg_ignoreuserview')); ?>		
 		<?php echo wpsg_drawForm_Checkbox('wpsg_classicupload', __('Klassisches Upload Formular', 'wpsg'), $this->get_option('wpsg_classicupload')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_content_filter_direct', __('Ausgaben im Warenkorb direkt ausgeben', 'wpsg'), $this->get_option('wpsg_content_filter_direct')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_options_no_rte_apply_filter', __('ApplyFilter Funktion nicht anwenden', 'wpsg'), $this->get_option('wpsg_options_no_rte_apply_filter')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_options_nl2br_out', __('RTE Felder mit nl2br ausgeben', 'wpsg'), $this->get_option('wpsg_options_nl2br_out')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_impexp_clearlinebreak', __('Zeilenumbrüche im Export entfernen', 'wpsg'), $this->get_option('wpsg_impexp_clearlinebreak')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_options_nl2br_out', __('RTE Felder mit nl2br ausgeben', 'wpsg'), $this->get_option('wpsg_options_nl2br_out'), array('help' => 'wpsg_options_n12br_out')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_impexp_clearlinebreak', __('Zeilenumbrüche im Export entfernen', 'wpsg'), $this->get_option('wpsg_impexp_clearlinebreak'), array('help' => 'wpsg_impexp_clearlinebreak')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_removeWpAutoOp', __('wpautop deaktivieren', 'wpsg'), $this->get_option('wpsg_removeWpAutoOp'), array('help' => 'wpsg_removeWpAutoOp')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_removeWpTrimExcerpt', __('wp_trim_excerpt nicht verwenden', 'wpsg'), $this->get_option('wpsg_removeWpTrimExcerpt'), array('help' => 'wpsg_removeWpTrimExcerpt')); ?>		
+		<?php echo wpsg_drawForm_Checkbox('wpsg_removeWpTrimExcerpt', __('wp_trim_excerpt nicht verwenden', 'wpsg'), $this->get_option('wpsg_removeWpTrimExcerpt'), array('help' => 'wpsg_removeWpTrimExcerpt')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_lockOrderTables', __('Bestellungen nicht mit LOCK TABLES verarbeiten', 'wpsg'), $this->get_option('wpsg_lockOrderTables'), array('help' => 'wpsg_lockOrderTables')); ?>		
 		<?php echo wpsg_drawForm_Checkbox('wpsg_autoraw', __('[raw] und [/raw] um Templates ausgeben (Frontend)', 'wpsg'), $this->get_option('wpsg_autoraw')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_nocache', __('Cachen von dynamischen Shopseiten verhindern', 'wpsg'), $this->get_option('wpsg_nocache')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_autolineending', __('MAC Kompatibilität bei Dateiimporten', 'wpsg'), $this->get_option('wpsg_autolineending')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_nocache', __('Cachen von dynamischen Shopseiten verhindern', 'wpsg'), $this->get_option('wpsg_nocache'), array('help' => 'wpsg_nocache')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_autolineending', __('MAC Kompatibilität bei Dateiimporten', 'wpsg'), $this->get_option('wpsg_autolineending'), array('help' => 'wpsg_autolineending')); ?>
 		<?php echo wpsg_drawForm_Select('wpsg_geo_determination', __('Abfrage des Kundenstandortes (EU-Leistungsortregel)', 'wpsg'), $this->view['arGeoMode'], $this->get_option('wpsg_geo_determination'), array('help' => 'wpsg_geo_determination')); ?>
 								
 		<script type="text/javascript">
diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml
index 9c08291..8edf92b 100644
--- a/views/admin/form/checkbox.phtml
+++ b/views/admin/form/checkbox.phtml
@@ -1,4 +1,4 @@
-<div class="form-group">
+<div class="form-group form-group-sm form-checkbox">
 
 	<div class="col-sm-offset-6 col-sm-6">
 		
diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
index c1213d2..e412bcd 100644
--- a/views/admin/form/input.phtml
+++ b/views/admin/form/input.phtml
@@ -1,9 +1,9 @@
-<div class="form-group">
+<div class="form-group form-group-sm">
 
 	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>
 	
 	<div class="col-sm-6">
-		<input type="text" class="form-control" name="<?php echo $this->view['field_name']; ?>" value="<?php echo wpsg_hspc($this->view['field_value']); ?>" id="<?php echo $this->view['field_id']; ?>" />
+		<input type="text" class="form-control input-sm" name="<?php echo $this->view['field_name']; ?>" value="<?php echo wpsg_hspc($this->view['field_value']); ?>" id="<?php echo $this->view['field_id']; ?>" />		
 	</div>
 	
 </div>
\ No newline at end of file
diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml
index 70e040c..d0f0ee7 100644
--- a/views/admin/form/select.phtml
+++ b/views/admin/form/select.phtml
@@ -1,10 +1,10 @@
-<div class="form-group">
+<div class="form-group form-group-sm">
 
 	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>
 	
 	<div class="col-sm-6">
 		
-		<select id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>">
+		<select id="<?php echo $this->view['field_id']; ?>" name="<?php echo $this->view['field_name']; ?>" class="form-control input-sm">
 			<?php foreach ($this->view['field_values'] as $k => $v) { ?>
 			<option <?php echo (($k == $this->view['field_value'])?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($k); ?>"><?php echo wpsg_hspc($v); ?></option>
 			<?php } ?>
diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml
index 49554c5..8325653 100644
--- a/views/admin/form/text.phtml
+++ b/views/admin/form/text.phtml
@@ -1,9 +1,9 @@
-<div class="form-group">
+<div class="form-group form-group-sm">
 
 	<label class="control-label col-sm-6" for=""><?php echo $this->view['field_label']; ?></label>
 	
 	<div class="col-sm-6">
-		<p class="form-control-static"><?php echo wpsg_hspc($this->view['field_value']); ?></p>
+		<p class="form-control-static"><?php echo $this->view['field_value']; ?></p>
 	</div>
 	
 </div>
\ No newline at end of file
diff --git a/views/admin/includes.phtml b/views/admin/includes.phtml
index b5b8201..8f085cf 100644
--- a/views/admin/includes.phtml
+++ b/views/admin/includes.phtml
@@ -23,12 +23,12 @@
 <div style="padding:0px; margin:0px; float:left;">		
 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $_REQUEST['subaction']; ?>&amp;noheader=1">
 		
-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_css', __('Shop CSS styles nicht einbinden', 'wpsg'), $this->get_option('wpsg_load_css')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_load_css', __('Shop CSS styles nicht einbinden', 'wpsg'), $this->get_option('wpsg_load_css'), array('help' => 'wpsg_load_css')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_load_jquery', __('JQuery einbinden', 'wpsg'), $this->get_option('wpsg_load_jquery'), array('help' => 'wpsg_load_jquery')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_load_thickbox_js', __('Thickbox einbinden (JavaScript)', 'wpsg'), $this->get_option('wpsg_load_thickbox_js'), array('help' => 'wpsg_load_thickbox')); ?>
 		<?php echo wpsg_drawForm_Checkbox('wpsg_load_thickbox_css', __('Thickbox einbinden (Styles)', 'wpsg'), $this->get_option('wpsg_load_thickbox_css'), array('help' => 'wpsg_load_thickbox')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_js', __('Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_js')); ?>
-		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_css', __('CSS der Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_css')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_js', __('Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_js'), array('help' => 'wpsg_load_validierung')); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_load_validierung_css', __('CSS der Javascript Validierung laden', 'wpsg'), $this->get_option('wpsg_load_validierung_css'), array('help' => 'wpsg_load_validierung')); ?>
 		
 		<?php $this->callMods('admin_includes'); ?>
 		
diff --git a/views/admin/index.phtml b/views/admin/index.phtml
index 848da7f..247f418 100644
--- a/views/admin/index.phtml
+++ b/views/admin/index.phtml
@@ -9,7 +9,7 @@
 
 <div class="wpsg_admin" id="wpsg-bs">
 
-	<nav class="navbar navbar-default navbar-admin navbar-fixed-top">
+	<nav class="navbar navbar-default">
 		<div class="container-fluid">
 			<div class="navbar-header">
 				<a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>
@@ -25,8 +25,8 @@
 					
 					<li role="presentation" class="<?php echo (($this->view['actionName'] == 'news')?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=news">
 						<?php echo __('Aktuelles', 'wpsg'); ?>
-						<?php if (wpsg_isSizedInt($wpsg_news_unread = wpsg_news::countUnreadNews())) { ?>
-						<span class="badge" style="background-color:#D9534F;">4</span>
+						<?php $wpsg_news_unread = wpsg_news::countUnreadNews(); if (wpsg_isSizedInt($wpsg_news_unread)) { ?>
+						<span class="badge" style="background-color:#D9534F;"><?php echo sizeof($wpsg_news_unread); ?></span>
 						<?php } ?>			
 					</a></li>
 				</ul>
diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml
index 2febb89..85f2075 100644
--- a/views/admin/konfiguration.phtml
+++ b/views/admin/konfiguration.phtml
@@ -18,7 +18,7 @@
 		
 <div class="wpsg_admin_content form-horizontal">
 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=konfiguration&noheader=1'); ?>">
-  
+    
   		<?php if ($this->hasMod('wpsg_mod_core')) { ?>
   		
 			<?php if ($this->arLizenz['l'] == 0) { ?>
@@ -81,16 +81,10 @@
 			<div class="wpsg_clear"></div>
 		</div>
 		<?php } else { ?>
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<?php echo __("Installierte DB Version", "wpsg"); ?>:
-			</div>
-			<div class="wpsg_form_right">
-				<p><?php echo WPSG_VERSION; ?>&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=allgemein&amp;do=update&amp;submit=1&amp;noheader=1"><?php echo __("Aktualisieren", "wpsg"); ?></a></p>
-				<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" class="wpsg_form_help"></a>
-			</div>
-			<div class="wpsg_clear"></div>
-		</div>	
+		<?php wpsg_drawForm_TextStart(); ?>		
+		<?php echo WPSG_VERSION; ?>&nbsp;<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=allgemein&amp;do=update&amp;submit=1&amp;noheader=1"><?php echo __("Aktualisieren", "wpsg"); ?></a>
+		<a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=DBUpdate" class="wpsg_form_help"></a>
+		<?php echo wpsg_drawForm_TextEnd(__('Installierte DB Version', 'wpsg')); ?>	
 		<?php } ?>
 		<br />
 		
diff --git a/views/admin/module.phtml b/views/admin/module.phtml
index a0a3a0c..9acd05c 100644
--- a/views/admin/module.phtml
+++ b/views/admin/module.phtml
@@ -8,12 +8,20 @@
 ?>
 <div class="wpsg_admin_submenu">
 	
+	<div class="wpsg_modul_search_wrap">
+		<input id="wpsg_modul_search" type="text" class="wpsg_modul_search" value="<?php echo wpsg_getStr($_COOKIE['wpsg-modulfilter-search']); ?>" />	
+		<label title="<?php echo __('Wenn aktiviert, werden nur aktive Module angezeigt'); ?>">
+			<input type="checkbox" <?php echo ((wpsg_isSizedString($_COOKIE['wpsg-modulfilter-check'], 'true'))?'checked="checked"':''); ?> id="wpsg_modul_onlyactive" class="wpsg_modul_onlyactive" />
+			<span class="glyphicon glyphicon-ok wpsg_modul_onlyactive_glyphicon" aria-hidden="true"></span>
+		</label>
+	</div>
+	
 	<?php foreach ($this->view['groups'] as $group_name => $g) { ?>
-	<div class="list-group">
-		<span class="list-group-head list-group-item"><?php echo $group_name; ?></span>		
+	<div class="list-group list-modul-group">
+		<span class="list-group-item list-group-head"><?php echo $group_name; ?></span>		
 		<?php foreach ($g as $mod_key => $m) { ?>
-		<a class="<?php echo (($this->get_option($mod_key, $this->view['global']) > 0)?'modul_akt':''); ?> list-group-item <?php echo (($mod_key == $_REQUEST['modul'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $mod_key; ?>">
-			<?php echo $m->name; ?>
+		<a class="<?php echo (($this->get_option($mod_key, $this->view['global']) > 0)?'modul_akt':''); ?> list-group-modul list-group-item <?php echo (($mod_key == $_REQUEST['modul'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $mod_key; ?>">
+			<span class="wpsg_modul_name"><?php echo $m->name; ?></span>
 			<?php if (($this->get_option($mod_key, $this->view['global']) > 0)?'modul_akt':'') { ?>
 			<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
 			<?php } ?>
@@ -25,7 +33,7 @@
 </div>
 
 <?php if (isset($_REQUEST['modul'])) { ?>
-<div class="wpsg_admin_content">		
+<div class="wpsg_admin_content form-horizontal">		
 	<form name="form1" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module&amp;modul=<?php echo $_REQUEST['modul']; ?>&amp;noheader=1" method="post" enctype="multipart/form-data">
 		
 		<h3>
@@ -37,19 +45,9 @@
 		
 		<p><?php echo $this->arAllModule[$_REQUEST['modul']]->desc; ?></p>
 		
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<?php echo __("Modul aktiviert", "wpsg"); ?>:
-			</div>
-			<div class="wpsg_form_right">
-				<select name="aktiv">
-					<option value="0"><?php echo __('Nein', 'wpsg'); ?></option>
-					<option value="1" <?php echo (($this->get_option($_REQUEST['modul'], $this->view['global']) > 0)?'selected="selected"':''); ?>><?php echo __('Ja', 'wpsg'); ?></option>					
-				</select>
-			</div>
-			<div class="wpsg_clear"></div>
-		</div>
-		 
+		<?php $modul_install = $this->get_option($_REQUEST['modul'], $this->view['global']); ?>
+		<?php echo wpsg_drawForm_Select('aktiv', __('Modul aktiviert', 'wpsg'), array('0' => __('Nein', 'wpsg'), '1' => __('Ja', 'wpsg')), ((wpsg_isSizedInt($modul_install))?'1':'0')); ?>
+		 		 
 		<?php if (isset($this->arAllModule[$_REQUEST['modul']]->version)) { ?>
 		<?php echo wpsg_drawForm_Input('', __('Version', 'wpsg'), $this->arAllModule[$_REQUEST['modul']]->version, array('text' => true)); ?>		
 		<div class="wpsg_form_field">
@@ -128,10 +126,63 @@
 
 <script type="text/javascript">/* <![CDATA[ */
 
+	function wpsg_ssh_module()
+	{
+
+		jQuery('.list-modul-group').show();
+		jQuery('.wpsg_admin_submenu .list-group-item').show();
+
+		var check = jQuery('#wpsg_modul_onlyactive').prop('checked');
+		var search = jQuery('#wpsg_modul_search').val();
+
+		jQuery.cookie('wpsg-modulfilter-check', check);
+		jQuery.cookie('wpsg-modulfilter-search', search);
+		
+		jQuery('.wpsg_modul_name').each(function() {
+
+			if (!jQuery(this).parent().hasClass('active'))
+			{
+			
+				if (check && !jQuery(this).parent().hasClass('modul_akt')) jQuery(this).parent().hide();
+				else if (search != '')
+				{
+	
+					var re = new RegExp(search, 'i');
+	
+					if (!jQuery(this).html().match(re)) jQuery(this).parent().hide();
+					else jQuery(this).parent().show();
+						
+				}
+
+			}
+				
+		} ); 
+
+		jQuery('.list-modul-group').each(function() {
+
+			if (jQuery(this).find('.list-group-modul:visible').length <= 0) jQuery(this).hide();
+			else jQuery(this).show();				
+			
+		} );
+		
+	}
+
 	jQuery(document).ready(function() {
 
+		jQuery('#wpsg_modul_onlyactive').bind('change', function(event) {
+
+			wpsg_ssh_module();			
+			jQuery(this).blur();
+			
+		} );
+
+		jQuery('#wpsg_modul_search').focus().bind('blur', wpsg_ssh_module);
+		jQuery('#wpsg_modul_search').focus().bind('keyup', wpsg_ssh_module);
+		
 		jQuery('.wpsg_form_help').tipTip();
 
+		wpsg_ssh_module();
+		
 	} );
 
 /* ]]> */</script>
\ No newline at end of file
-- 
cgit v1.2.3