- Demo Modus / Meldunstuning

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

1 files changed, 40 insertions, 24 deletions

diff --git a/views/admin/module.phtml b/views/admin/module.phtml
index 2564940..4cc4c6a 100644
--- a/views/admin/module.phtml
+++ b/views/admin/module.phtml
@@ -44,31 +44,35 @@
 	<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>

-			<?php echo $this->arAllModule[$_REQUEST['modul']]->name; ?>

-			<?php if (isset($this->arAllModule[$_REQUEST['modul']]->hilfeURL) && $this->arAllModule[$_REQUEST['modul']]->hilfeURL != '') { ?>

-			<a target="_blank" href="<?php echo $this->arAllModule[$_REQUEST['modul']]->hilfeURL; ?>" class="wpsg_form_help_notip"></a>	

-			<?php } ?>

+		<?php echo $this->arAllModule[$_REQUEST['modul']]->name; ?>

+		<?php if (isset($this->arAllModule[$_REQUEST['modul']]->hilfeURL) && $this->arAllModule[$_REQUEST['modul']]->hilfeURL != '') { ?>

+		<a target="_blank" href="<?php echo $this->arAllModule[$_REQUEST['modul']]->hilfeURL; ?>" class="wpsg_form_help_notip"></a>	

+		<?php } ?>

 		</h3> -->

 		

 		<p><?php echo $this->arAllModule[$_REQUEST['modul']]->desc; ?></p><br />

 		

-		<?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 (@$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['demo_active'] === true || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['active'] === true || $wpsg_update_data['modulinfo'][$_REQUEST['modul']]['free'] === true) { ?>

+		

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

 		 		 

 		<?php if (isset($this->arAllModule[$_REQUEST['modul']]->version)) { ?>

 			

 		<?php echo wpsg_drawForm_TextStart(); ?>

 		

 			<?php 

-			

+			 

 				echo $this->arAllModule[$_REQUEST['modul']]->version;

 			

 				if (wpsg_isSizedArray($modul_info[$_REQUEST['modul']]))

 				{

 			

 					$modul_info_modul = $modul_info[$_REQUEST['modul']];

-				

-					if ($modul_info_modul['version'] === $this->shop->arAllModule[$_REQUEST['modul']]->version)

+				 

+					if ($modul_info_modul['version'] === $this->arAllModule[$_REQUEST['modul']]->version)

 					{

 						

 						echo ' - <strong class="wpsg_message_ok">'.__('aktuell', 'wpsg').'</strong>';

@@ -80,18 +84,13 @@
 						echo ' - <strong class="wpsg_error">'.__('neue Version verfügbar', 'wpsg').'</strong><br />'.wpsg_translate(__('<a href="#1#">wpShopGermany Update</a> notwendig', 'wpsg'), WPSG_URL_WP.'wp-admin/plugins.php');

 						

 					}

-					else if (version_compare($modul_info_modul['version'], $this->shop->arAllModule[$_REQUEST['modul']]->versio) > 0) 

+					else if (version_compare($modul_info_modul['version'], $this->arAllModule[$_REQUEST['modul']]->versio) > 0) 

 					{

 						

 						echo ' - <strong class="wpsg_error">'.__('neue Version verfügbar', 'wpsg').'</strong>';

 						

-						if ($modul_info_modul['active'] === true) 

-						{

-						

-							echo '<br />';

-							echo wpsg_translate(__('<a href="#1#">Version installieren</a>.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$_REQUEST['modul']);

-							

-						}

+						echo '<br />';

+						echo wpsg_translate(__('<a href="#1#">Version installieren</a>.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$_REQUEST['modul']);

 						

 					}

 					

@@ -110,7 +109,12 @@
 				<?php } else if (wpsg_isTrue($modul_info[$_REQUEST['modul']]['active'])) { ?>

 					<span class="wpsg_message_ok"><?php echo __('Aktiv', 'wpsg'); ?></span>

 				<?php } else { ?>

-					<span class="wpsg_error"><?php echo __('Nicht aktiv', 'wpsg'); ?></span>

+					

+					<?php if (wpsg_isTrue($modul_info[$_REQUEST['modul']]['demo_active'])) { ?>

+						<span class="wpsg_message_demo"><?php echo __('Demo Modus', 'wpsg'); ?></span>

+					<?php } else { ?> 

+						<span class="wpsg_error"><?php echo __('Nicht aktiv', 'wpsg'); ?></span>

+					<?php } ?>

 					

 					<?php if (wpsg_isSizedString($modul_info[$_REQUEST['modul']]['shop_url'])) {  ?>

 					[ <a href="<?php echo $modul_info[$_REQUEST['modul']]['shop_url']; ?>"><?php echo __('Modulcode erwerben', 'wpsg'); ?></a> ]					

@@ -119,6 +123,12 @@
 					<?php } ?>

 					[ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=modulactivation"><?php echo __('Modulcode eingeben', 'wpsg'); ?></a> ]

 					

+					<?php if (!wpsg_isTrue($modul_info[$_REQUEST['modul']]['demo_active'])) { ?>

+					<br />

+					

+					[ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=startDemo&modul=<?php echo $_REQUEST['modul']; ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher? Das Modul kann 14 Tage ab heute komplett in vollem Umfang getestet werden.', 'wpsg'); ?>');"><?php echo __('Demo Modus starten'); ?></a> ]

+					<?php } ?>

+						

 				<?php } ?>

 					

 			<?php } else { ?>

@@ -126,12 +136,13 @@
 			<?php } ?>

 						

 		<?php echo wpsg_drawForm_TextEnd(__('Lizenz')); ?>

-		 	

-		<hr />

-			

+					

 		<?php } ?>

 		

-		<?php if (!isset($this->arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || 1))) { ?>

+		<?php if (!isset($this->arAllModule[$_REQUEST['modul']]->version) || (@$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['demo_active'] === true || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['active'] === true || $wpsg_update_data['modulinfo'][$_REQUEST['modul']]['free'] === true)) { ?>

+		

+			<hr />

+		

 			<?php if ($this->arAllModule[$_REQUEST['modul']]->inline === true) { ?>

 			<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>

 			<?php } ?> 

@@ -149,8 +160,13 @@
 			<?php if ($this->arAllModule[$_REQUEST['modul']]->inline !== true) { ?>

 			<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>			

 			<?php } ?>

+	

 		<?php } else { ?>

-		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>

+	

+			<?php if (@$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['demo_active'] === true || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['active'] === true || $wpsg_update_data['modulinfo'][$_REQUEST['modul']]['free'] === true) { ?>

+			<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>

+			<?php } ?>

+			

 		<?php } ?>

 						

 	<?php if ($this->arAllModule[$_REQUEST['modul']]->inline !== true) { ?>

@@ -285,7 +301,7 @@
 				<?php } else { ?>

 				

 				<p>

-					Lizenz aktivieren

+					<?php echo __('Bitte erwerben Sie eine Lizenz für wpShopGermany, damit sie unsere Erweiterungsmodule nutzen können.', 'wpsg'); ?>

 				</p>

 					

 				<?php } ?>