From 1a9c2a709be8ee0846f10e13b7a0faea7ecb61f1 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 2 Nov 2017 14:02:16 +0000
Subject: - Feature - Produktname in Produktverwaltung - Feature - Anzeige von
 angepassten Templates auf der "Über" Seite (Wenn Userviews aktiv) - Feature -
 Produkttemplates werden jetzt auch im Child Theme gesucht und verwendet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6677 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/ueber.phtml     | 56 ++++++++++++++-------------------------------
 views/css/admin.css         |  1 +
 views/produkt/addedit.phtml |  3 +++
 3 files changed, 21 insertions(+), 39 deletions(-)

(limited to 'views')

diff --git a/views/admin/ueber.phtml b/views/admin/ueber.phtml
index e99d51b..4902e5a 100644
--- a/views/admin/ueber.phtml
+++ b/views/admin/ueber.phtml
@@ -81,63 +81,41 @@
 	</div>
 
 	<div class="form-horizontal">
+
 		<?php wpsg_drawForm_TextStart(); ?>
 		<?php echo WPSG_PATH_USERVIEW; ?>
-
 		<?php echo wpsg_drawForm_TextEnd(__('Template Pfad für Anpassungen', '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;
-		}
+		<?php if ($this->get_option('wpsg_ignoreuserview') != '1') { ?>
 
-		echo wpsg_drawForm_TextStart();
+			<?php $arProductTemplates = $this->loadProduktTemplates(false, true, true); ?>
 
-		if (file_exists(WPSG_PATH_USERVIEW) && is_dir(WPSG_PATH_USERVIEW))
-		{
+			<?php $arFiles = wpsg_rglob(WPSG_PATH_VIEW.'*'); $arFiles = array_merge($arFiles, $arProductTemplates); ?>
+			<?php foreach ($arFiles as $k => $f) { $render_file = realpath($this->getTemplatefile($f)); if (!is_file($render_file) || realpath($f) == $render_file) { unset($arFiles[$k]); } else { $arFiles[$k] = $render_file; } } $arFiles = array_unique($arFiles); asort($arFiles); ?>
 
-			$arDir = iterateDir(WPSG_PATH_USERVIEW);
+			<?php if (wpsg_isSizedArray($arFiles)) { ?>
+				<div class="form-group-sm form-group">
+					<div class="form-control-static">
 
-			$sd = ''; foreach ($arDir as $k => $d) $sd .= $d.'<br />';
+						<label style="font-weight:bold;"><?php echo __('Angepasste Templates', 'wpsg'); ?></label><br /><br />
 
-			echo $sd;
+						<?php foreach($arFiles as $render_file) { ?>
 
-		}
-		else
-		{
+							<?php echo str_replace(realpath(WPSG_PATH_WP), '', $render_file); ?><br />
 
-			echo WPSG_PATH_USERVIEW;
+						<?php } ?>
 
-		}
+					</div>
+				</div>
+			<?php } ?>
 
-		echo wpsg_drawForm_TextEnd(__('User-Views', 'wpsg'));
+		<?php } ?>
 
-		?>
+	</div>
 
 
 <?php echo wpsg_drawForm_AdminboxEnd(); ?>
diff --git a/views/css/admin.css b/views/css/admin.css
index becaf30..5de8ea7 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -191,6 +191,7 @@ table.wpsgitrecht_table { width:100%; }
  */
 .wpsg_productview_backend-sold-out { color:#dc3232; font-weight:700; }
 .wpsg_productview_backend-available { color:#7ad03a; font-weight:700; float:left; margin-right:5px; }
+.wpsg_top_productname { line-height:50px; margin-left:15px; }
 
 /* Bewertung */
 .wpsg_rating { background-color:#29556E; }
diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml
index 420888b..ec7dd69 100644
--- a/views/produkt/addedit.phtml
+++ b/views/produkt/addedit.phtml
@@ -18,6 +18,9 @@
 				<ul class="nav navbar-nav">
 					<li role="presentation" class="active"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt"><?php echo __("Produktübersicht", "wpsg"); ?></a></li>
 					<li role="presentation" class="wpsg_showhide_filter active"><a href="#" onclick="return false;"><?php echo __("Produkte anlegen/bearbeiten", "wpsg"); ?></a></li>
+					<li role="presentation" class="wpsg_top_productname">
+						<?php echo $this->view['oProduct']->getProductName(); ?>
+					</li>
 				</ul>
 			</div>
 		</div>
-- 
cgit v1.2.3