From 43ea6181489947c87a3c622b3c8e52883e7b7a08 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Wed, 7 Jun 2017 05:35:00 +0000
Subject: - Title deaktivierbar per Shortcode

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6315 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/css/frontend.css      |  1 +
 views/js/mce_plugin.js      |  3 +++
 views/produkt/select.phtml  | 15 ++++++++++++++-
 views/warenkorb/index.phtml | 20 +++++++++++---------
 4 files changed, 29 insertions(+), 10 deletions(-)

(limited to 'views')

diff --git a/views/css/frontend.css b/views/css/frontend.css
index af7cda9..9ec60ef 100644
--- a/views/css/frontend.css
+++ b/views/css/frontend.css
@@ -169,6 +169,7 @@ input.wpsg_error { border-color:red !important; }
 .wpsg_basket_widget table .wpsg_cell_name { padding-left:0.2rem; }
 .wpsg_basket_widget table .wpsg_cell_amount { text-align:right; padding-right:0.2rem; }
 .wpsg_basket_widget table .wpsg_row_summary .wpsg_cell_amount { font-weight:bold; }
+.wpsg_basket_widget .wpsg_tax_note { font-size:0.75em; }
 
 /* Modul Kundenverwaltung */
 .wpsg_mod_kundenverwaltung_widget input[type="text"], .wpsg_mod_kundenverwaltung_widget input[type="password"] { width:100%; margin-bottom:0.5rem; }
diff --git a/views/js/mce_plugin.js b/views/js/mce_plugin.js
index b287d13..7aaf6ca 100644
--- a/views/js/mce_plugin.js
+++ b/views/js/mce_plugin.js
@@ -27,7 +27,9 @@
 		},
  
 		createControl : function(n, cm) {
+			
 			return null;
+			
 		},
  
 		getInfo : function() {
@@ -38,6 +40,7 @@
 				version : "3.0"
 			};
 		}
+		
 	});
 
 	tinymce.PluginManager.add('wpsg', tinymce.plugins.wpsgPlugin);
diff --git a/views/produkt/select.phtml b/views/produkt/select.phtml
index 834476a..0d2ca13 100644
--- a/views/produkt/select.phtml
+++ b/views/produkt/select.phtml
@@ -58,6 +58,13 @@
 				
 				}
 				
+				if (document.getElementById("title") != null && document.getElementById("title").value != "1")
+				{
+					
+					text += " hide_title=\"1\" ";
+					
+				}
+				
 				text += "]";
 									
 				if (window.tinyMCE)
@@ -146,7 +153,13 @@
 				<?php } else { ?>			
 					
 					<?php echo wpsg_drawForm_Select('produkt', __('Produkt', 'wpsg'), $this->view['arProdukte'], false); ?>
-					<?php echo wpsg_drawForm_Select('template', __('Template', 'wpsg'), $this->view['arTemplates'], false); ?>
+					
+					<div class="col-xs-6">
+						<div class="row"><?php echo wpsg_drawForm_Select('template', __('Template', 'wpsg'), $this->view['arTemplates'], false); ?></div>
+					</div>
+					<div class="col-xs-6">
+						<div class="row"><?php echo wpsg_drawForm_Select('title', __('Titel anzeigen', 'wpsg'), array('1' => __('Ja', 'wpsg'), '0' => __('Nein', 'wpsg')), '1'); ?></div>
+					</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();" />
diff --git a/views/warenkorb/index.phtml b/views/warenkorb/index.phtml
index 45f7bd1..a6a6eb7 100644
--- a/views/warenkorb/index.phtml
+++ b/views/warenkorb/index.phtml
@@ -67,16 +67,18 @@
 				<td class="wpsg_cell_amount"><?php echo wpsg_ff($this->view['basket']['sum']['preis'], $this->get_option('wpsg_currency')); ?></td>
 			</tr>
 		</table>
-	</form>
-	<br />
+	</form> 
+		
+	<span class="wpsg_tax_note">
+		<?php if (trim($this->view['wpsg_versandhinweis']) != '') { ?>
+		<i><?php echo $this->view['wpsg_versandhinweis']; ?></i><br />
+		<?php } else if ($this->get_option("wpsg_kleinunternehmer") == "1" || $this->getFrontendTaxview() == WPSG_NETTO) { ?>
+		<i><?php echo __("Alle Preise zzgl. ", "wpsg"); ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a>.</i>
+		<?php } else { ?>
+		<i><?php echo __("Alle Preise inklusive MwSt. und zzgl.", "wpsg"); ?> <a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a></i><br />
+		<?php } ?>
+	</span>
 		
-	<?php if (trim($this->view['wpsg_versandhinweis']) != '') { ?>
-	<i><?php echo $this->view['wpsg_versandhinweis']; ?></i><br />
-	<?php } else if ($this->get_option("wpsg_kleinunternehmer") == "1" || $this->getFrontendTaxview() == WPSG_NETTO) { ?>
-	<i><?php echo __("Alle Preise zzgl. ", "wpsg"); ?><a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a>.</i>
-	<?php } else { ?>
-	<i><?php echo __("Alle Preise inklusive MwSt. und zzgl.", "wpsg"); ?> <a href="<?php echo $this->getURL(wpsg_ShopController::URL_VERSANDKOSTEN); ?>"><?php echo __("Versandkosten", "wpsg"); ?></a></i><br />
-	<?php } ?>
 	<?php if ($this->get_option('wpsg_page_basket') != get_the_ID() || isset($_REQUEST['produkt_id'])) { ?>
 	<input type="button" class="wpsg_button wpshopgermany_linktokasse" onclick="location.href='<?php echo $this->getURL(wpsg_ShopController:: URL_BASKET); ?>';" value="<?php echo __("Zum Warenkorb", "wpsg"); ?>" />
 	<?php } ?>
-- 
cgit v1.2.3