From 94b6b128d93490cbcc82cd89671dc9e300fd172b Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Fri, 20 Oct 2017 13:10:26 +0000
Subject: - Shoptheme erkennt auch das Verzeichnis wpshopgermany (Für
 Entwicklungsumgebung) - Produkturl in Produktverwaltung zeigt bei
 Produktartikelverwendung auf den übersetzen Artikel - Systemcheck ausgebaut
 und Meldungen ausblendbar - Kommentare für Produktartikel global aktivierbar
 (Nur mit Theme)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6633 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/hilfe.phtml                            |   9 +-
 views/admin/ueber.phtml                            | 124 +++++++++++----------
 views/js/admin.js                                  |  12 +-
 .../produkt_addedit_content.phtml                  |   5 +-
 views/mods/mod_produktartikel/settings_edit.phtml  |   6 +
 views/produkt/addedit.phtml                        |   6 +-
 views/produkt/select.phtml                         |  29 ++++-
 7 files changed, 114 insertions(+), 77 deletions(-)

(limited to 'views')

diff --git a/views/admin/hilfe.phtml b/views/admin/hilfe.phtml
index a56acab..3486484 100644
--- a/views/admin/hilfe.phtml
+++ b/views/admin/hilfe.phtml
@@ -27,12 +27,5 @@
 	<p><?php echo __("Wir orientieren uns direkt am Markt. Insofern geben wir dir als User die Möglichkeit mitzuentscheiden, welches Feature wpShopGermany zukünftig haben wird. Du kannst selber einen Feature-Wunsch anlegen, oder für einen bestehenden Wunsch deine Stimme abgeben.", "wpsg"); ?></p>
 	<a href="https://wpshopgermany.uservoice.com/">https://wpshopgermany.uservoice.com/</a>
 	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
-	
-	<?php echo wpsg_drawForm_AdminboxStart(__('Migration der alten Mehrwertsteuersätze', 'wpsg')); ?>
-	<p><?php echo wpsg_translate(
-		__('Ab Version 3.5 wurden die Mehrwertsteuersätze den Ländern zugeordnet. Die alten Mehrwertsteuersätze können <a href="#1#">hier</a> umgewandelt werden.', 'wpsg'),
-		WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=migratemwst'
-	); ?>
-	<?php echo wpsg_drawForm_AdminboxEnd(); ?>
-			
+
 </div>
\ No newline at end of file
diff --git a/views/admin/ueber.phtml b/views/admin/ueber.phtml
index 65c7901..82b685b 100644
--- a/views/admin/ueber.phtml
+++ b/views/admin/ueber.phtml
@@ -80,6 +80,66 @@
 	<?php echo wpsg_drawForm_TextEnd(); ?>
 	</div>
 
+	<div class="form-horizontal">
+		<?php wpsg_drawForm_TextStart(); ?>
+		<?php echo WPSG_PATH_USERVIEW; ?>
+
+		<?php echo wpsg_drawForm_TextEnd(__('Template Pfad', 'wpsg')); ?>
+
+		<?php wpsg_drawForm_TextStart(); ?>
+		<?php echo WPSG_PATH_TRANSLATION; ?>
+
+		<?php echo wpsg_drawForm_TextEnd(__('Sprachdatei', 'wpsg')); ?>
+	</div>
+
+	<div class="form-horizontal">
+		<?php
+
+		function iterateDir($sPath)
+		{
+			$aRes = array();
+			$pathuv = str_replace('\\', '/', WPSG_PATH_USERVIEW);
+			foreach(new DirectoryIterator($sPath) as $oItem)
+			{
+				if($oItem->isDir())
+				{
+					//(!$oItem->isDot() ? $aRes[$oItem->getFilename()] = iterateDir($oItem->getPathname()):0);
+					if (!$oItem->isDot()) {
+						$aResx = iterateDir($oItem->getPathname());
+						$aRes = array_merge($aRes, $aResx);
+					}
+					continue;
+				}
+				//$aRes[] = $oItem->getFilename();
+				$aRes[] = str_replace($pathuv, '', str_replace('\\', '/', $oItem->getPathname()));
+			}
+			return $aRes;
+		}
+
+		echo wpsg_drawForm_TextStart();
+
+		if (file_exists(WPSG_PATH_USERVIEW) && is_dir(WPSG_PATH_USERVIEW))
+		{
+
+			$arDir = iterateDir(WPSG_PATH_USERVIEW);
+
+			$sd = ''; foreach ($arDir as $k => $d) $sd .= $d.'<br />';
+
+			echo $sd;
+
+		}
+		else
+		{
+
+			echo WPSG_PATH_USERVIEW;
+
+		}
+
+		echo wpsg_drawForm_TextEnd(__('User-Views', 'wpsg'));
+
+		?>
+
+
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
 <?php } ?>
 
@@ -134,19 +194,9 @@
 <?php if (isset($_REQUEST['subaction']) && $_REQUEST['subaction'] == 'systemcheck') { ?>
 <?php echo wpsg_drawForm_AdminboxStart(__('Systemcheck', 'wpsg')); ?>
 
-	<div class="form-horizontal">
-	<?php wpsg_drawForm_TextStart(); ?>
-	<?php echo WPSG_PATH_USERVIEW; ?>
-
-	<?php echo wpsg_drawForm_TextEnd(__('Template Pfad', 'wpsg')); ?>
-
-	<?php wpsg_drawForm_TextStart(); ?>
-	<?php echo WPSG_PATH_TRANSLATION; ?>
-
-	<?php echo wpsg_drawForm_TextEnd(__('Sprachdatei', 'wpsg')); ?>
-	</div>
+	<a class="button" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=resetMessages&noheader=1"><?php echo __('Ausgeblendete Meldungen zurücksetzen', 'wpsg'); ?></a>
 
-	<?php $arData = array(); $this->callMods('systemcheck', array(&$arData)); ?>
+	<?php $arData = $this->systemcheck(); ?>
 	<?php if (wpsg_isSizedArray($arData)) { ?>
 		<div class="wpsg_admin_ueber_check_wrap">
 			<?php foreach ($arData as $d) { ?>
@@ -155,55 +205,9 @@
 				</p>
 			<?php } ?>
 		</div>
-	<?php } ?>
-
-	<div class="form-horizontal">
-	<?php
-
-	function iterateDir($sPath)
-	{
-		$aRes = array();
-		$pathuv = str_replace('\\', '/', WPSG_PATH_USERVIEW);
-		foreach(new DirectoryIterator($sPath) as $oItem)
-		{
-			if($oItem->isDir())
-	 		{
-				//(!$oItem->isDot() ? $aRes[$oItem->getFilename()] = iterateDir($oItem->getPathname()):0);
-	 			if (!$oItem->isDot()) {
-	 				$aResx = iterateDir($oItem->getPathname());
-	 				$aRes = array_merge($aRes, $aResx);
-	 			}
-				continue;
-			}
-			//$aRes[] = $oItem->getFilename();
-			$aRes[] = str_replace($pathuv, '', str_replace('\\', '/', $oItem->getPathname()));
-		}
-		return $aRes;
-	}
-
-	echo wpsg_drawForm_TextStart();
-	
-	if (file_exists(WPSG_PATH_USERVIEW) && is_dir(WPSG_PATH_USERVIEW))
-	{
-		
-		$arDir = iterateDir(WPSG_PATH_USERVIEW);
-
-		$sd = ''; foreach ($arDir as $k => $d) $sd .= $d.'<br />';
-
-		echo $sd;
+	<?php } else { ?>
 
-	} 
-	else 
-	{
-	
-		echo WPSG_PATH_USERVIEW;
-				
-	}
-	
-	echo wpsg_drawForm_TextEnd(__('User-Views', 'wpsg'));
-	
-	?>
-	</div>
+	<?php } ?>
 
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
 <?php } ?>
diff --git a/views/js/admin.js b/views/js/admin.js
index fa32ba8..c466f59 100644
--- a/views/js/admin.js
+++ b/views/js/admin.js
@@ -149,9 +149,15 @@ function wpsg_in_array(needle, haystack)
 
 	var po; 
 
-	function wpsg_ajaxBind()
-	{
-		
+	function wpsg_ajaxBind() {
+
+		jQuery('.wpsg-is-dismissible').on('click', '.notice-dismiss', function(event, el) {
+
+			var dismiss_url = jQuery(this).parent('.notice.is-dismissible').attr('data-dismiss-url');
+			if (dismiss_url) { jQuery.get(dismiss_url); }
+
+		});
+
 		// Hilfe Tooltips
 		jQuery('*[data-wpsg-tip]').on('click', function() { 
 
diff --git a/views/mods/mod_produktartikel/produkt_addedit_content.phtml b/views/mods/mod_produktartikel/produkt_addedit_content.phtml
index 7f58019..d8821c2 100644
--- a/views/mods/mod_produktartikel/produkt_addedit_content.phtml
+++ b/views/mods/mod_produktartikel/produkt_addedit_content.phtml
@@ -25,8 +25,11 @@
 <?php echo wpsg_drawForm_AdminboxStart(__('Einstellungen zum Produktartikel', 'wpsg')); ?>
 	
 	<?php echo wpsg_drawForm_Input('wpsg_produktartikel_menuorder', __('Position', 'wpsg'), wpsg_getStr($this->view['data']['menu_order'])); ?>
+
+	<?php if ($this->get_option('wpsg_mod_produktartikel_comment') <= 0) { ?>
 	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel[kommentare]', __('Kommentare', 'wpsg'), wpsg_isSizedString($this->view['data']['comment_status'], 'open')); ?>
-	
+	<?php } ?>
+
 	<br />
 	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktartikel"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Produktartikel', 'wpsg'); ?></a>
 		
diff --git a/views/mods/mod_produktartikel/settings_edit.phtml b/views/mods/mod_produktartikel/settings_edit.phtml
index 170b150..a6b6ce6 100644
--- a/views/mods/mod_produktartikel/settings_edit.phtml
+++ b/views/mods/mod_produktartikel/settings_edit.phtml
@@ -18,6 +18,12 @@
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_ean', __('Darstellung der EAN', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_ean'), array('help' => 'wpsg_mod_produktartikel_ean')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_gtin', __('Darstellung der GTIN', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_gtin'), array('help' => 'wpsg_mod_produktartikel_gtin')); ?>
 
+<?php echo wpsg_drawForm_Select('wpsg_mod_produktartikel_comment', __('Kommentarfunktion', 'wpsg'), array(
+	'0' => __('Produktspezifisch', 'wpsg'),
+	'1' => __('Global aktiviert', 'wpsg'),
+	'2' => __('Global deaktiviert', 'wpsg')
+), $this->get_option('wpsg_mod_produktartikel_comment')); ?>
+
 <?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>
 <?php echo wpsg_drawForm_Text(__('Produkttemplate für Ansicht auf Startseite', 'wpsg'), __('Keine Templatedateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>
 <?php } else { ?>
diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml
index 0e1eed3..420888b 100644
--- a/views/produkt/addedit.phtml
+++ b/views/produkt/addedit.phtml
@@ -32,7 +32,11 @@
 			<div class="list-group" id="wpsg_product_tabs">		
 			
 				<?php if (wpsg_isSizedInt($this->view['data']['id'])) { ?>
-				<span class="list-group-head list-group-item"><?php echo wpsg_translate(__('Produkt ID:#1# <span style="float:right;"><a href="#2#" title="Produkt im Frontend ansehen" target="_blank"><span class="glyphicon glyphicon-new-window"></span></a></span>', 'wpsg'), $this->view['data']['id'], $this->view['oProduct']->getProductURL()); ?></span>
+				<span class="list-group-head list-group-item"><?php echo wpsg_translate(
+					__('Produkt ID:#1# <span style="float:right;"><a href="#2#" title="Produkt im Frontend ansehen" target="_blank"><span class="glyphicon glyphicon-new-window"></span></a></span>', 'wpsg'),
+					$this->view['data']['id'],
+					$this->view['oProduct']->getProductURL(((isset($_REQUEST['wpsg_lang']))?$_REQUEST['wpsg_lang']:false))
+				); ?></span>
 				<?php } else { ?>
 				<span class="list-group-head list-group-item"><?php echo __('Neues Produkt', 'wpsg'); ?></span>
 				<?php } ?>
diff --git a/views/produkt/select.phtml b/views/produkt/select.phtml
index 89c095a..2fd0f31 100644
--- a/views/produkt/select.phtml
+++ b/views/produkt/select.phtml
@@ -139,10 +139,31 @@
 			} // function insertProduktClose()
 			<?php } ?>
 			
-		</script> 
+		</script>
+
+		<style>
+
+			<?php if ($_REQUEST['wpsg_mode'] != 'wpsg_mod_relatedproducts') { ?>
+
+				* { font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif; }
+			    #wpsg-bs { min-width:100px; }
+				body { padding:0px 15px 0px 15px ; }
+				label { mragin-bottom:5px; }
+				select { width:100%; margin-bottom:15px; }
+				input[type="button"] { float:right; margin-top:30px; }
+
+			<?php } else { ?>
+
+				body { margin:0px; padding:0px; min-width:0%; }
+				input[type="button"] { float:right; margin-right:15px; margin-top:15px; }
+
+			<?php } ?>
+
+		</style>
+
 	</head>
 	
-	<body id="wpsg-bs" style="margin:0px; padding:0px; min-width:0%;">
+	<body id="wpsg-bs">
   	
 		<div class="container-fluid">
 			<div class="row">
@@ -161,7 +182,7 @@
 					</div>
 					
 					<?php if ($_REQUEST['wpsg_mode'] != 'wpsg_mod_relatedproducts') { ?>				
-					<input class="btn btn-primary" style="float:right; margin-right:15px; margin-top:15px;" type="button" value="<?php echo __('Einfügen', 'wpsg'); ?>" onclick="return insertProdukt();" />
+					<input class="btn btn-primary" type="button" value="<?php echo __('Einfügen', 'wpsg'); ?>" onclick="return insertProdukt();" />
 					<?php } ?>
 					
 					<div class="wpsg_clear"></div><br />
@@ -170,7 +191,7 @@
 					<?php echo wpsg_drawForm_Select('produktgroup', __('Produktgruppe', 'wpsg'), $this->view['arProduktgroups'], false); ?>
 					<?php echo wpsg_drawForm_Select('produktgroup_order', __('Sortierung', 'wpsg'), $this->view['arProductgroupsOrder'], false); ?>
 					<?php echo wpsg_drawForm_Select('produktgroup_direction', __('Richtung', 'wpsg'), $this->view['arProductgroupsDirection'], false); ?> 
-					<input class="btn btn-primary" style="float:right; margin-right:15px; margin-top:15px;" type="button" value="<?php echo __('Einfügen', 'wpsg'); ?>" onclick="return insertProductgroup();" />
+					<input class="btn btn-primary" type="button" value="<?php echo __('Einfügen', 'wpsg'); ?>" onclick="return insertProductgroup();" />
 					<?php } ?>
 											
 				<?php } ?>
-- 
cgit v1.2.3