From 6e3783cb429e327bb1c4a5a8b760b2f76da1f25c Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Sun, 6 Mar 2016 16:51:09 +0000
Subject: - Online Test - Dialog zur Shortcode generierung - Anzeige von
 Produktgruppen und Kategorien in Produktansichten - Produktverwaltung
 aufgehübscht - Entwarnt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5391 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 .../mod_productgroups/produkt_edit_sidebar.phtml   |   6 +-
 views/mods/mod_productview/mce_plugin.js           |  46 +++++++++
 views/mods/mod_productview/productview.phtml       |   3 +-
 .../mods/mod_productview/shortcodegenerator.phtml  | 114 +++++++++++++++++++++
 .../mod_produktartikel/produkt_edit_sidebar.phtml  |  19 +---
 5 files changed, 169 insertions(+), 19 deletions(-)
 create mode 100644 views/mods/mod_productview/mce_plugin.js
 create mode 100644 views/mods/mod_productview/shortcodegenerator.phtml

(limited to 'views/mods')

diff --git a/views/mods/mod_productgroups/produkt_edit_sidebar.phtml b/views/mods/mod_productgroups/produkt_edit_sidebar.phtml
index a7a90f4..c1fab76 100644
--- a/views/mods/mod_productgroups/produkt_edit_sidebar.phtml
+++ b/views/mods/mod_productgroups/produkt_edit_sidebar.phtml
@@ -15,9 +15,9 @@
 		<?php if (sizeof($this->view['wpsg_mod_productgroups']['data']) <= 0) { ?>
 		<p><?php echo __('Bisher wurden keine Produktgruppen angelegt.', 'wpsg'); ?></p>
 		<?php } else { ?>
-		<?php echo wpsg_drawForm_Select('wpsg_productgroup', __('Produktgruppe', 'wpsg'), $this->view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_von', __('Sticky von', 'wpsg'), $this->view['wpsg_mod_productgroups']['sticky_von']); ?>
-		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_bis', __('Sticky bis', 'wpsg'), $this->view['wpsg_mod_productgroups']['sticky_bis']); ?>
+		<?php echo wpsg_drawForm_Select('wpsg_productgroup', __('Produktgruppe', 'wpsg'), @$this->view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_von', __('Sticky von', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_von']); ?>
+		<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_bis', __('Sticky bis', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_bis']); ?>
 		<?php } ?>
 		
 		<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;page=wpsg-Productgroups"><?php echo __('Produktgruppenverwaltung', 'wpsg'); ?></a>
diff --git a/views/mods/mod_productview/mce_plugin.js b/views/mods/mod_productview/mce_plugin.js
new file mode 100644
index 0000000..179e488
--- /dev/null
+++ b/views/mods/mod_productview/mce_plugin.js
@@ -0,0 +1,46 @@
+(function() {
+ 
+	tinymce.create('tinymce.plugins.wpsgModProductviewPlugin', {
+		
+		init : function(ed, url) {
+ 
+			ed.addCommand('mcewpsg2', function() {
+				ed.windowManager.open({
+					file : 'admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_productview&noheader=1',
+					title: 'Produktansicht generieren',
+					width : 450,
+					height : 450,
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+ 
+			ed.addButton('wpsgModProductviewPlugin', {
+				title : 'Produkte über die Produktansicht anzeigen',
+				cmd : 'mcewpsg2',
+				image : url + '/../../gfx/table.png'
+			});
+ 
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('wpsgModProductviewPlugin', n.nodeName == 'IMG');
+			});
+		},
+ 
+		createControl : function(n, cm) {
+			return null;
+		},
+ 
+		getInfo : function() {
+			return {
+				longname : 'wpShopGermany Produktauswahl',
+				author : 'maennchen1.de',
+				authorurl : 'http://maennchen1.de',
+				version : "3.0"
+			};
+		}
+	});
+
+	tinymce.PluginManager.add('wpsgModProductviewPlugin', tinymce.plugins.wpsgModProductviewPlugin);
+	
+})();
diff --git a/views/mods/mod_productview/productview.phtml b/views/mods/mod_productview/productview.phtml
index 2175f48..111f774 100644
--- a/views/mods/mod_productview/productview.phtml
+++ b/views/mods/mod_productview/productview.phtml
@@ -14,7 +14,8 @@
 		
 		<?php if (wpsg_isSizedArray($this->view['wpsg_mod_productview']['products'])) { ?>
 		<div class="col-lg-3 wpsg_mod_productview-order">
-			asd
+			<?php echo __('Sortierung', 'wpsg'); ?><span class="glyphicon glyphicon-menu-down"></span>
+			<strong>Neueste zuerst</strong>
 		</div>
 		
 		<div class="col-lg-6 wpsg_mod_productview-info">
diff --git a/views/mods/mod_productview/shortcodegenerator.phtml b/views/mods/mod_productview/shortcodegenerator.phtml
new file mode 100644
index 0000000..b68b548
--- /dev/null
+++ b/views/mods/mod_productview/shortcodegenerator.phtml
@@ -0,0 +1,114 @@
+<?php
+
+	/**
+	 * Template für die Produktauswahl über den RTE
+	 */
+
+?>
+<html>
+	<head>
+		<title><?php echo __('Produktansicht generieren', 'wpsg'); ?></title>
+	
+		<script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl'); ?>/wp-includes/js/jquery/jquery.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl'); ?>/wp-includes/js/tinymce/tiny_mce_popup.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl'); ?>/wp-includes/js/tinymce/utils/mctabs.js"></script>
+		<script language="javascript" type="text/javascript" src="<?php echo get_option('siteurl'); ?>/wp-includes/js/tinymce/utils/form_utils.js"></script>
+		
+		<link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-content/plugins/wpshopgermany/views/js/bootstrap-3.3.6-dist/css/bootstrap.css" type="text/css" media="all" />
+		<link rel="stylesheet" href="<?php echo get_option('siteurl'); ?>/wp-content/plugins/wpshopgermany/views/js/bootstrap-3.3.6-dist/css/bootstrap-theme.css" type="text/css" media="all" />
+	</head>
+	<body>
+	 
+		<div style="padding-top:15px; font-size:12px;" class="form-horizontal">
+		
+			<div class="container-fluid">
+			
+				<?php echo wpsg_drawForm_Input('title', __('Titel', 'wpsg'), ''); ?>
+				<?php echo wpsg_drawForm_Select('showswitch', __('Anzeige', 'wpsg'), $this->view['arSelect'], '-1'); ?>
+					
+				<div class="showswitch showswitch_0" style="display:none;">
+					<?php echo wpsg_drawForm_Input('product_ids', __('Produkte (IDs kommagetrennt)', 'wpsg'), ''); ?>
+				</div>
+					
+				<div class="showswitch showswitch_9" style="display:none;">
+					<?php echo wpsg_drawForm_Select('pg_ids', __('Produktgruppen (Mehrfachauswahl mit STRG)', 'wpsg'), $this->view['arProductgroups'], '', array('multiple' => 8)); ?>
+				</div>
+				
+				<div class="showswitch showswitch_15" style="display:none;">
+					<?php echo wpsg_drawForm_Select('pg_cat', __('Produktkategorien (Mehrfachauswahl mit STRG)', 'wpsg'), $this->view['arCategories'], '', array('multiple' => 8)); ?>
+				</div>
+				
+			</div>
+			
+			<input onclick="return insertSC();" style="margin:15px; width:auto; display:block; padding:3px 10px 3px 10px; box-sizing:border-box;" type="button" value="<?php echo __('Shortcode einfügen', 'wpsg'); ?>" />			
+		
+			<script type="text/javascript">/* <![CDATA[ */
+
+				function insertSC()
+				{
+
+					var text = "[wpsg_productview ";
+
+					if (jQuery('#title').val().length > 0) text += ' title="' + jQuery('#title').val() + '"';
+					if (jQuery('#showswitch').val() == '-1') text += ' product="-1"'; 							
+					else if (jQuery('#showswitch').val() == '0') text += ' product="' + jQuery('#product_ids').val() + '"';
+					else if (jQuery('#showswitch').val() == '9') 
+					{
+
+						text += ' productgroup_ids="'; var arIDs = [];
+						jQuery('#pg_ids option:selected').each(function() { arIDs.push(jQuery(this).val()); } );
+						text += arIDs.join(',') + '"';
+						
+					}
+					else if (jQuery('#showswitch').val() == '15') 
+					{
+
+						text += ' cat_ids="'; var arIDs = [];
+						jQuery('#pg_cat option:selected').each(function() { arIDs.push(jQuery(this).val()); } );
+						text += arIDs.join(',') + '"';
+						
+					}
+					
+					text += "]";
+										
+					if (window.tinyMCE)
+					{
+
+						<?php if (get_bloginfo('version') < 3.9) { ?>
+							
+						window.tinyMCE.execInstanceCommand("content", "mceInsertContent", false, text);
+						tinyMCEPopup.editor.execCommand("mceRepaint");			
+							
+						<?php } else { ?>
+
+						parent.tinyMCE.execCommand('mceInsertContent', false, text);
+						parent.tinyMCE.activeEditor.windowManager.close();
+							
+						<?php } ?>
+														
+										
+						tinyMCEPopup.close();
+																				
+					}
+					
+					return false;
+					
+				}
+            
+				jQuery(document).ready(function() {
+
+					jQuery('#showswitch').bind('change', function() {
+ 
+						jQuery('.showswitch').hide();
+						jQuery('.showswitch_' + jQuery(this).val()).show();
+						
+					} ).change();
+					
+				} );
+			 
+			/* ]]> */</script>
+		
+		</div>
+		
+	</body>
+</html>
\ No newline at end of file
diff --git a/views/mods/mod_produktartikel/produkt_edit_sidebar.phtml b/views/mods/mod_produktartikel/produkt_edit_sidebar.phtml
index a2cd9e0..b82821e 100644
--- a/views/mods/mod_produktartikel/produkt_edit_sidebar.phtml
+++ b/views/mods/mod_produktartikel/produkt_edit_sidebar.phtml
@@ -10,20 +10,9 @@
 		<span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
 		<span><?php echo __('Produktartikel', 'wpsg'); ?> </span>
 	</h3>
-	<div class="inside">		
-		<div class="wpsg_form_field">
-			<div class="wpsg_form_left">
-				<label for="wpsg_produktartikel_kommentare"><?php echo __('Kommentare', 'wpsg'); ?>:</label>
-			</div>
-			<div class="wpsg_form_right">
-				<input id="wpsg_produktartikel_kommentare" type="checkbox"
-					class="checkbox" name="wpsg_mod_produktartikel[kommentare]"
-					value="1"
-					<?php echo (($this->view['data']['comment_status'] == 'open')?'checked="checked"':''); ?> />
-			</div>
-			<div class="wpsg_clear"></div>
-		</div>
-		<?php echo wpsg_drawForm_Input('wpsg_produktartikel_menuorder', __('Position', 'wpsg'), $this->view['data']['menu_order']); ?>
+	<div class="inside">
+		<?php echo wpsg_drawForm_Input('wpsg_produktartikel_menuorder', __('Position', 'wpsg'), @$this->view['data']['menu_order']); ?>
+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel[kommentare]', __('Kommentare', 'wpsg'), @$this->view['data']['comment_status']); ?>
 	</div>
 </div>
  
@@ -35,7 +24,7 @@
 
 			<div id="category-all" class="tabs-panel">
 				<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-					<?php wp_terms_checklist($this->view['data']['post_id'], array('taxonomy' => 'category')); ?>
+					<?php wp_terms_checklist(@$this->view['data']['post_id'], array('taxonomy' => 'category')); ?>
 				</ul>
 			</div>
 
-- 
cgit v1.2.3