- Backup V4

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

6 files changed, 224 insertions, 165 deletions

diff --git a/views/mods/mod_productview/productview.js b/views/mods/mod_productview/productview.js
index 89704d7..d80dc83 100644
--- a/views/mods/mod_productview/productview.js
+++ b/views/mods/mod_productview/productview.js
@@ -1,9 +1,20 @@
 

 	function wpsg_switchProductview(index, page, order, mode)

 	{

+		 

+		var atts = jQuery.parseJSON(jQuery('#wpsg_productview_' + index + ' input[name="wpsg_atts"]').val());

+			

+		atts.page = page;

+		atts.order = order;

+		atts.mode = mode; 

+		

+		if (jQuery('#wpsg_mod_productview_filter').length > 0)

+		{

+		

+			atts.filter = jQuery('#wpsg_mod_productview_filter input').serialize();

+			

+		}

 		

-		var atts = jQuery('#wpsg_productview_' + index + ' input[name="wpsg_atts"]').val();

-					

 		jQuery('#wpsg_productview_' + index).append('<div class="wpsg_mod_productview_loading"></div>');

 		

 		jQuery.ajax( {

@@ -11,10 +22,7 @@
 			'data': { 

 				'wpsg_mod': 'wpsg_mod_productview',

 				'wpsg_action': 'refresh', 

-				'wpsg_atts': atts,

-				'wpsg_page': page,

-				'wpsg_order': order,

-				'wpsg_mode': mode

+				'wpsg_atts': atts		

 			},

 			'success': function(data) {

 				

@@ -38,6 +46,30 @@
 	

 	jQuery(document).ready(function() {

 		

+		var filter_min = parseFloat(jQuery('#wpsg_mod_productview_filter_price_info input[name="price_min"]').val());

+		var filter_max = parseFloat(jQuery('#wpsg_mod_productview_filter_price_info input[name="price_max"]').val());

+		

+		jQuery("#wpsg_mod_productview_filter_price-range").slider( {

+			range: true,

+			min: filter_min,

+			max: filter_max,

+			values: [filter_min, filter_max],

+			slide: function(event, ui) {

+				

+				jQuery('#wpsg_mod_productview_filter_price_info input[name="price_min"]').val(ui.values[0]);

+				jQuery('#wpsg_mod_productview_filter_price_info input[name="price_max"]').val(ui.values[1]);

+				

+				jQuery('#wpsg_mod_productview_filter_price_info .min').html(wpsg_numberformat(ui.values[0], 2));

+				jQuery('#wpsg_mod_productview_filter_price_info .max').html(wpsg_numberformat(ui.values[1], 2));

+				

+			},

+			stop: function(event, ui) {

+				

+				wpsg_switchProductview(1, 1);

+				

+			}

+		} );

+		

 		jQuery('.wpsg_productview').each(function() { 

 			

 			var x = jQuery(this).attr("id").substr(17);

diff --git a/views/mods/mod_productview/productview.phtml b/views/mods/mod_productview/productview.phtml
index 5897387..e643db7 100644
--- a/views/mods/mod_productview/productview.phtml
+++ b/views/mods/mod_productview/productview.phtml
@@ -8,17 +8,21 @@
 ?>

 <div class="wpsg_productview" id="wpsg_productview_<?php echo $this->view['wpsg_mod_productview']['index']; ?>">

 	

+	<input type="hidden" name="wpsg_atts" value="<?php echo @wpsg_hspc(json_encode($this->view['wpsg_mod_productview']['atts'])); ?>" />

+	

 	<div class="wpsg_productview_head row">

 	

-		<h2 class="wpsg_productview_title col-lg-3"><?php echo wpsg_hspc($this->view['wpsg_mod_productview']['title']); ?></h2>

+		<?php if ($this->view['wpsg_mod_productview']['cols'] != 3) { ?>

+		<h2 class="wpsg_productview_title <?php echo $this->view['wpsg_mod_productview']['col_class']['title']; ?>"><?php echo wpsg_hspc($this->view['wpsg_mod_productview']['title']); ?></h2>

+		<?php } ?>

 		

 		<?php if (wpsg_isSizedArray($this->view['wpsg_mod_productview']['products'])) { ?>

-		<div class="col-lg-3 wpsg_mod_productview-order">

+		<div class="wpsg_mod_productview-order <?php echo $this->view['wpsg_mod_productview']['col_class']['order']; ?>">

 			<?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">

+		<div class="wpsg_mod_productview-info <?php echo $this->view['wpsg_mod_productview']['col_class']['info']; ?>">

 			<strong><?php 

 				echo wpsg_translate(__('Anzeige #1# - #2#', 'wpsg'), 

 					($this->view['wpsg_mod_productview']['page'] - 1) * $this->view['wpsg_mod_productview']['per_page'] + 1, 

@@ -35,7 +39,7 @@
 		<?php if (wpsg_isSizedArray($this->view['wpsg_mod_productview']['products'])) { ?>

 		

 			<?php $i = 0; foreach ($this->view['wpsg_mod_productview']['products'] as $oProduct) { $i ++; ?>

-			<div class="wpsg_productview_product wpsg_productview_product_<?php echo $oProduct->id; ?> col-lg-3">

+			<div class="wpsg_productview_product wpsg_productview_product_<?php echo $oProduct->id; ?> <?php echo $this->view['wpsg_mod_productview']['col_class']['product']; ?>">

 				

 				<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>

 				<?php $image_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage', array($oProduct->id, 520, 520, 'sz')); ?>

@@ -89,12 +93,10 @@
 					<a class="wpsg_mod_productview_button" href="<?php echo $oProduct->getProductURL(); ?>"><?php echo __('Zum Produkt', 'wpsg'); ?><span class="fa fa-angle-double-right"></span></a>

 					 					

 				</div>

-				

-				<input type="hidden" name="wpsg_atts" value="<?php echo @wpsg_hspc(serialize($this->view['wpsg_mod_productview']['atts'])); ?>" />

-								

+												

 			</div>

 			

-			<?php if ($i % 4 === 0) { ?>

+			<?php if ($i % $this->view['wpsg_mod_productview']['cols'] === 0) { ?>

 			<div class="clearfix visible-lg-block"></div>

 			<?php } ?>

 			

diff --git a/views/mods/mod_productview/productview_filter.phtml b/views/mods/mod_productview/productview_filter.phtml
new file mode 100644
index 0000000..7456bee
--- /dev/null
+++ b/views/mods/mod_productview/productview_filter.phtml
@@ -0,0 +1,20 @@
+<div class="wpsg_mod_productview_filter" id="wpsg_mod_productview_filter">

+	<?php if ($this->hasMod('wpsg_mod_produktartikel') && wpsg_isSizedArray($this->view['arCat'])) { ?>

+	<div class="wpsg_mod_productview_filter_item wpsg_mod_productview_filter_cat">

+		<ul>

+			<?php foreach ($this->view['arCat'] as $cat_id => $cat_name) { ?>

+			<li><a href="<?php echo get_term_link($cat_id); ?>" title="<?php echo wpsg_hspc($cat_name); ?>"><?php echo wpsg_hspc($cat_name); ?></a></li>

+			<?php } ?>

+		</ul>

+	</div> 

+	<?php } ?>

+	<div class="wpsg_mod_productview_filter_item wpsg_mod_productview_filter_price">	

+		<h2><?php echo __('Sortierung nach Preis', 'wpsg'); ?></h2>

+		<div id="wpsg_mod_productview_filter_price-range"><span class="ui-slider-bg"></span></div>

+	</div>

+	<div id="wpsg_mod_productview_filter_price_info">

+		<?php echo __('Preis:', 'wpsg'); ?><span class="min"><?php echo wpsg_ff($this->get_option('wpsg_mod_productview_filter_min')); ?></span> <?php echo $this->get_option('wpsg_currency'); ?> - <span class="max"><?php echo wpsg_ff($this->get_option('wpsg_mod_productview_filter_max')); ?></span> <?php echo $this->get_option('wpsg_currency'); ?>

+		<input type="hidden" name="price_min" value="<?php echo $this->get_option('wpsg_mod_productview_filter_min'); ?>" />

+		<input type="hidden" name="price_max" value="<?php echo $this->get_option('wpsg_mod_productview_filter_max'); ?>" />

+	</div>

+</div>
\ No newline at end of file
diff --git a/views/mods/mod_productview/settings_edit.phtml b/views/mods/mod_productview/settings_edit.phtml
new file mode 100644
index 0000000..bfb101d
--- /dev/null
+++ b/views/mods/mod_productview/settings_edit.phtml
@@ -0,0 +1,9 @@
+<?php

+

+	/**

+	 * Template für die Einstellungen des Moduls "Produktansichten"

+	 */

+

+?>

+<?php echo wpsg_drawForm_Input('wpsg_mod_productview_filter_min', __('Minimaler Preis für Preisfilter', 'wpsg'), $this->get_option('wpsg_mod_productview_filter_min')); ?>

+<?php echo wpsg_drawForm_Input('wpsg_mod_productview_filter_max', __('Maximaler Preis für Preisfilter', 'wpsg'), $this->get_option('wpsg_mod_productview_filter_max')); ?>
\ No newline at end of file
diff --git a/views/mods/mod_produktattribute/list.phtml b/views/mods/mod_produktattribute/list.phtml
index 900e265..f90b6ee 100644
--- a/views/mods/mod_produktattribute/list.phtml
+++ b/views/mods/mod_produktattribute/list.phtml
@@ -8,122 +8,126 @@
 <?php if (sizeof($this->view['data']) <= 0) { ?>

 <p><?php echo __('Keine Produktattribute hinterlegt.', 'wpsg'); ?></p>

 <?php } else { ?>

-<table class="wpsg_mod_produktattribute_table">

-	<tr>

-		<th class="col_id"><?php echo __('ID', 'wpsg'); ?></th>

-		<th class="col_name" colspan="2"><?php echo __('Bezeichnung', 'wpsg'); ?></th>

-		<th class="col_html"></th>

-		<th class="col_show"><a href="#" onclick="return false;" class="wpsg_icon wpsg_icon_lupe" title="<?php echo __('Werte direkt in jedem Template anzeigen wenn gesetzt.', 'wpsg'); ?>"></a></th>

-		<th class="col_typ"><?php echo __('Typ', 'wpsg'); ?></th>		

-		<th class="col_action"></th>

-	</tr>

+<table class="wpsg_mod_produktattribute_table table">

+	<thead>

+		<tr>

+			<th class="col_id"><?php echo __('ID', 'wpsg'); ?></th>

+			<th class="col_name" colspan="2"><?php echo __('Bezeichnung', 'wpsg'); ?></th>			

+			<th class="col_show"><?php echo __('Anzeigen', 'wpsg'); ?></th>

+			<th class="col_typ"><?php echo __('Typ', 'wpsg'); ?></th>		 

+			<th class="col_action"></th>

+		</tr>

+	</thead>	

 	<?php foreach ($this->view['data'] as $pa) { ?>

-	<tr id="pa_<?php echo $pa['id']; ?>" class="wpsg_tablerow">

-		<td class="col_id wpsg_id"><?php echo $pa['id']; ?></td>

-		<td colspan="2" id="pa_<?php echo $pa['id']; ?>_name" class="col_name wpsg_editable"><?php echo wpsg_hspc($pa['name']); ?></td>

-		<td class="col_html">

-			<a class="wpsg_icon wpsg_icon_html wpsg_icon_center" href="#" title="<?php echo __('HTML Code generieren', 'wpsg'); ?>" onclick="return wpsg_genPACode(<?php echo $pa['id']; ?>);"></a>

-		</td>

-		<td class="col_show">

-			<input title="<?php echo __('Werte direkt in jedem Template anzeigen wenn gesetzt.', 'wpsg'); ?>" id="show_<?php echo $pa['id']; ?>" <?php echo (($pa['autoshow'] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" />

-		</td>

-		<td class="col_typ">

-			<select id="typ_<?php echo $pa['id']; ?>" name="pa[<?php echo $pa['id']; ?>][typ]" onchange="wpsg_mod_produktattribute_changeTyp(<?php echo $pa['id']; ?>);">

-				<option <?php echo (($pa['typ'] == '0')?'selected="selected"':''); ?> value="0"><?php echo __('Textfeld', 'wpsg'); ?></option>

-				<option <?php echo (($pa['typ'] == '1')?'selected="selected"':''); ?> value="1"><?php echo __('Textfeld (RTE)', 'wpsg'); ?></option>

-				<option <?php echo (($pa['typ'] == '2')?'selected="selected"':''); ?> value="2"><?php echo __('Auswahlfeld', 'wpsg'); ?></option>

-				<option <?php echo (($pa['typ'] == '3')?'selected="selected"':''); ?> value="3"><?php echo __('Checkbox', 'wpsg'); ?></option>

-			</select>			

-		</td>		

-		<td class="col_action">

-			

-			<a id="del_<?php echo $pa['id']; ?>" class="wpsg_icon wpsg_icon_remove" href="#" title="<?php echo __('Produktvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removePV(<?php echo $pv['id']; ?>);"></a>

-			

-			<script type="text/javascript">

-

-				jQuery('#del_<?php echo $pa['id']; ?>').bind('click', function() {

-

-					if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Produktattribute löschen möchten?', 'wpsg'); ?>')) return false;

-

-					jQuery('#wpsg_pa_list').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

-					

-					jQuery.ajax( {

-						url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1',

-						data: {

-							field: 'delete',

-							pa_id: '<?php echo $pa['id']; ?>'

-						},

-						success: function(data) {

-							jQuery('#wpsg_pa_list').html(data);		

-						}

+	<tbody id="pa_<?php echo $pa['id']; ?>">	

+		<tr class="wpsg_tablerow">

+			<td class="col_id wpsg_id"><?php echo $pa['id']; ?></td>

+			<td class="col_name" colspan="2"><span id="pa_<?php echo $pa['id']; ?>_name"><?php echo wpsg_hspc($pa['name']); ?></span></td>			

+			<td class="col_show">

+				<input title="<?php echo __('Werte direkt in jedem Template anzeigen wenn gesetzt.', 'wpsg'); ?>" id="show_<?php echo $pa['id']; ?>" <?php echo (($pa['autoshow'] == '1')?'checked="checked"':''); ?> type="checkbox" value="1" />

+			</td>

+			<td class="col_typ">

+				<select id="typ_<?php echo $pa['id']; ?>" name="pa[<?php echo $pa['id']; ?>][typ]" onchange="wpsg_mod_produktattribute_changeTyp(<?php echo $pa['id']; ?>);">

+					<option <?php echo (($pa['typ'] == '0')?'selected="selected"':''); ?> value="0"><?php echo __('Textfeld', 'wpsg'); ?></option>

+					<option <?php echo (($pa['typ'] == '1')?'selected="selected"':''); ?> value="1"><?php echo __('Textfeld (RTE)', 'wpsg'); ?></option>

+					<option <?php echo (($pa['typ'] == '2')?'selected="selected"':''); ?> value="2"><?php echo __('Auswahlfeld', 'wpsg'); ?></option>

+					<option <?php echo (($pa['typ'] == '3')?'selected="selected"':''); ?> value="3"><?php echo __('Checkbox', 'wpsg'); ?></option>

+				</select>			

+			</td>

+			<td class="col_action">

+				

+				<a class="wpsg-glyphlink-td" href="#" title="<?php echo __('HTML Code generieren', 'wpsg'); ?>" onclick="return wpsg_genPACode(<?php echo $pa['id']; ?>);">

+					<span class="glyphicon glyphicon-modal-window"></span>

+				</a>

+				

+				<a id="del_<?php echo $pa['id']; ?>" class="wpsg-glyphlink-td" href="#" title="<?php echo __('Produktvariable löschen', 'wpsg'); ?>" onclick="return wpsg_removePV(<?php echo $pv['id']; ?>);">

+					<span class="glyphicon glyphicon-trash"></span>

+				</a>

+				

+				<script type="text/javascript">/* <![CDATA[ */

+	

+					jQuery('#del_<?php echo $pa['id']; ?>').bind('click', function() {

+	

+						if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Produktattribute löschen möchten?', 'wpsg'); ?>')) return false;

+	

+						jQuery('#wpsg_pa_list').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

+						

+						jQuery.ajax( {

+							url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1',

+							data: {

+								field: 'delete',

+								pa_id: '<?php echo $pa['id']; ?>'

+							},

+							success: function(data) {

+								jQuery('#wpsg_pa_list').html(data);		

+							}

+						} );

+						

 					} );

-					

-				} );

-			

-				jQuery('#show_<?php echo $pa['id']; ?>').bind('change', function() {

-

-					if (jQuery(this).attr("checked")) value = 1; else value = 0;

-					

-					jQuery.ajax( {

-						url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1',

-						data: {

-							field: 'show',

-							value: value,

-							pa_id: '<?php echo $pa['id']; ?>'

-						},

-						success: function(data) {

-							if (data != "1") alert(data);

-						}

+				

+					jQuery('#show_<?php echo $pa['id']; ?>').bind('change', function() {

+	

+						if (jQuery(this).attr("checked")) value = 1; else value = 0;

+						

+						jQuery.ajax( {

+							url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1',

+							data: {

+								field: 'show',

+								value: value,

+								pa_id: '<?php echo $pa['id']; ?>'

+							},

+							success: function(data) {

+								if (data != "1") alert(data);

+							}

+						} );

+						

 					} );

-					

-				} );

-			

-				jQuery('#pa_<?php echo $pa['id']; ?>_name').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {

-					submitdata: { 

-			    		field: 'name',

-			    		pa_id: '<?php echo $pa['id']; ?>'

-					},

-					submit  : '<?php echo __('Speichern', 'wpsg'); ?>',

-					placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',

-					indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',

-			    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

-				});

-			

-			</script>

-			

-		</td>

-	</tr>

-	<tr class="auswahlrow auswahlrow_<?php echo $pa['id']; ?>">

-		<td></td>

-		<td>

-			<label>

-				<?php echo __('Auswahl (| als Trenner)', 'wpsg'); ?>:

-			</label>

-			<script type="text/javascript">

-

-				jQuery(document).ready(function() {

-					

-					jQuery('#pa_<?php echo $pa['id']; ?>_auswahl').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {

+				

+					jQuery('#pa_<?php echo $pa['id']; ?>_name').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {

 						submitdata: { 

-				    		field: 'auswahl',

+				    		field: 'name',

 				    		pa_id: '<?php echo $pa['id']; ?>'

 						},

-						data: '<?php echo $pa['auswahl']; ?>',

-						submit: '<?php echo __('Speichern', 'wpsg'); ?>',

+						submit  : '<?php echo __('Speichern', 'wpsg'); ?>',

 						placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',

 						indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',

 				    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

 					});

-

-					wpsg_mod_produktattribute_changeTyp(<?php echo $pa['id']; ?>);

-					

-				} );

-			

-			</script>

-		</td>

-		<td colspan="4" class="wpsg_editable" id="pa_<?php echo $pa['id']; ?>_auswahl"><?php echo wpsg_hspc(((trim($pa['auswahl']) == '')?__('Bitte anklicken um Auswahl kommagetrennt zu definieren', 'wpsg'):$pa['auswahl'])); ?></td>

-	</tr>

-	<?php } ?>

+				

+				/* ]]> */</script>

+				

+			</td>

+		</tr> 

+		<tr class="auswahlrow auswahlrow2 auswahlrow_<?php echo $pa['id']; ?>">

+			<td></td>

+			<td colspan="5">

+				<label><?php echo __('Auswahlmöglichkeiten ("|" als Trenner)', 'wpsg'); ?>:</label>&nbsp;				

+				<script type="text/javascript">/* <![CDATA[ */

+	

+					jQuery(document).ready(function() {

+						

+						jQuery('#pa_<?php echo $pa['id']; ?>_auswahl').wspg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=module&modul=wpsg_mod_produktattribute&do=inlinedit&noheader=1', {

+							submitdata: { 

+					    		field: 'auswahl',

+					    		pa_id: '<?php echo $pa['id']; ?>'

+							},

+							data: '<?php echo $pa['auswahl']; ?>',

+							submit: '<?php echo __('Speichern', 'wpsg'); ?>',

+							placeholder: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>',

+							indicator: '<?php echo __('Speicher ...', 'wpsg'); ?>',

+					    	tooltip: '<?php echo __('Zum Bearbeiten anklicken ...', 'wpsg'); ?>'

+						});

+	

+						wpsg_mod_produktattribute_changeTyp(<?php echo $pa['id']; ?>);

+						

+					} );

+				

+				/* ]]> */</script>			

+				<span id="pa_<?php echo $pa['id']; ?>_auswahl"><?php echo wpsg_hspc(((trim($pa['auswahl']) == '')?__('Bitte anklicken um Auswahl kommagetrennt zu definieren', 'wpsg'):$pa['auswahl'])); ?></span>

+			</td>

+		</tr>

+	</tbody> 

+	<?php } ?>	

 </table>

 

 <p class="wpsg_hinweis"><?php echo __('Die Reihenfolge lässt sich mittels Drag&Drop verändern.', 'wpsg'); ?>

@@ -134,7 +138,7 @@
 

 		jQuery('.wpsg_mod_produktattribute_table').sortable( {

 			helper: wpsg_Tablefix,

-			items: 'tr.wpsg_tablerow',

+			items: 'tbody',

 			handler: '.wpsg_id',

 			update: function(event, ui) {

 

@@ -153,7 +157,7 @@
 				} );

 				

 			}

-		} );

+		} ).disableSelection();

 		

 	} );

 			

diff --git a/views/mods/mod_produktattribute/settings_edit.phtml b/views/mods/mod_produktattribute/settings_edit.phtml
index 4fe3417..19c8e61 100644
--- a/views/mods/mod_produktattribute/settings_edit.phtml
+++ b/views/mods/mod_produktattribute/settings_edit.phtml
@@ -7,7 +7,7 @@
 	

 

 ?>

-<script type="text/javascript">

+<script type="text/javascript">/* <![CDATA[ */

  

 	/**

 	 * Wird beim wechsel des Typs von der Selectbox aufgerufen

@@ -63,54 +63,46 @@
 	function wpsg_genPACode(pa_id)

 	{

 

-		jQuery("#wpsg_pa_code_dialog").dialog( {

-			'dialogClass': 'wp-dialog',           

-	        'modal': true,

-	        'width': 600,

-	        'height': 300,	       

-	        'title': '<?php echo __('HTML Code Block', 'wpsg'); ?>',

-	        open: function(event, ui) {

-

-	        	jQuery('#wpsg_pa_code_dialog .wpsg_dialog').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

-	        	

-	        	jQuery.ajax( {

-	    			url: 'admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktattribute&do=genPACode&noheader=1',

-	    			data: {

-	    				'pa_id': pa_id

-	    			},

-	    			success: function(data)

-	    			{

-		    			jQuery('#wpsg_pa_code_dialog .wpsg_dialog').html(data);

-	    			}

-	        	} );

-		        

-	        }

-		} );

+		jQuery('#wpsg_code_dialog .modal-body').html('<img src="<?php echo WPSG_URL; ?>views/gfx/ajax-loader.gif" alt="<?php echo __('Bitte warten ...', 'wpsg'); ?>" />');

 		

+		jQuery('#wpsg_code_dialog').modal( { } )

+		

+		jQuery.ajax( {

+			url: 'admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktattribute&do=genPACode&noheader=1',

+			data: { 'pa_id': pa_id },

+			success: function(data) { jQuery('#wpsg_code_dialog .modal-body').html(data); }

+    	} );

+ 		

 		return false;

 		

 	} // function wpsg_genPACode(pa_id)

 	

-</script>

+/* ]]> */</script>

 

-<div id="wpsg_pa_code_dialog" style="display:none;"><div class="wpsg_dialog"></div></div>

+<!-- Modal für Codeanzeige -->

+<div class="modal fade" id="wpsg_code_dialog" tabindex="-1" role="dialog">

+  <div class="modal-dialog" role="document">

+    <div class="modal-content">

+      <div class="modal-header">

+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>

+        <h4 class="modal-title" id="myModalLabel"><?php echo __('HTML Code Block', 'wpsg'); ?></h4>

+      </div>

+      <div class="modal-body">

+        

+      </div>

+      <div class="modal-footer">

+        <button type="button" class="btn btn-default" data-dismiss="modal"><?php echo __('Schließen', 'wpsg'); ?></button> 

+      </div>

+    </div>

+  </div>

+</div>

 

-<div class="wpsg_admin_content">

-	<div class="wpsg_admin_box">		

-			  		

-		<div class="head">

-			<div class="title">

-				<div class="fulltab">

-					<?php echo __('Produktattribute', 'wpsg'); ?>

-					<a title="<?php echo __('Neues Produktattribut anlegen', 'wpsg'); ?>" href="" class="wpsg_icon wpsg_icon_right wpsg_icon_add" onclick="return wpsg_addPA();"></a>

-				</div>

-			</div>

-		</div>

-		<div class="content" id="wpsg_pa_list">

-			<?php $this->mod->pa_listAction(); ?>

-		</div>

-				

-	</div>

+<div class="content" id="wpsg_pa_list">

+	<?php $this->mod->pa_listAction(); ?>

 </div>

 

-<div class="clear"></div>
\ No newline at end of file
+<div class="clear"></div>

+

+<br />

+

+<a href="#" onclick="return wpsg_addPA();"><span class="wpsg-glyphicon glyphicon glyphicon-plus"></span><?php echo __('Neues Produktattribut anlegen', 'wpsg'); ?></a>
\ No newline at end of file