summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--views/mods/mod_downloadprodukte/produkt_edit_list.phtml2
-rw-r--r--views/mods/mod_productvars/produkt_addedit_sidebar.phtml2
-rw-r--r--views/mods/mod_produktbilder/produkt_addedit_content.phtml3
-rw-r--r--views/mods/mod_produktbilder/produkt_edit_list2.phtml3
-rw-r--r--views/produkt/addedit_general.phtml2
-rw-r--r--views/produkt/addedit_price.phtml2
-rw-r--r--views/produkttemplates/standard2.phtml3
7 files changed, 9 insertions, 8 deletions
diff --git a/views/mods/mod_downloadprodukte/produkt_edit_list.phtml b/views/mods/mod_downloadprodukte/produkt_edit_list.phtml
index 4ccf430..c0e5f32 100644
--- a/views/mods/mod_downloadprodukte/produkt_edit_list.phtml
+++ b/views/mods/mod_downloadprodukte/produkt_edit_list.phtml
@@ -19,4 +19,4 @@
</ul>
<?php } else { ?>
<p><?php echo __('Bisher keine Dateien hochgeladen.', 'wpsg'); ?>
-<?php } ?>
+<?php } ?> \ No newline at end of file
diff --git a/views/mods/mod_productvars/produkt_addedit_sidebar.phtml b/views/mods/mod_productvars/produkt_addedit_sidebar.phtml
index 094b366..f811ff2 100644
--- a/views/mods/mod_productvars/produkt_addedit_sidebar.phtml
+++ b/views/mods/mod_productvars/produkt_addedit_sidebar.phtml
@@ -30,4 +30,4 @@
<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productvars"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Produktvariablen', 'wpsg'); ?></a>
</div>
-</div>
+</div> \ No newline at end of file
diff --git a/views/mods/mod_produktbilder/produkt_addedit_content.phtml b/views/mods/mod_produktbilder/produkt_addedit_content.phtml
index 52d0eec..fb994a7 100644
--- a/views/mods/mod_produktbilder/produkt_addedit_content.phtml
+++ b/views/mods/mod_produktbilder/produkt_addedit_content.phtml
@@ -71,6 +71,7 @@
<div class="wpsg_clear"></div>
<div><?php echo __("Bitte klicken Sie auf Mediathek um ein Bild hochzuladen. Um ein Bild zu löschen klicken Sie einfach auf das Bild.", "wpsg"); ?></div>
+ <div><?php echo __("Die Reihenfolge kann mittels Drag&Drop verändert werden.", "wpsg"); ?></div>
<div class="wpsg_clear"></div><br />
<input value="Mediathek" class="button" type="text" style="text-align:center;" size="10" id="btnAddImgLink" />
@@ -98,6 +99,8 @@
},
success: function(data) {
+ //TODO die('1'); sendet: \n1
+ data = data.replace(/\n|\r/g, '');
if (data != '1') alert(data);
//wpsg_vp_ajaxloading_hide();
diff --git a/views/mods/mod_produktbilder/produkt_edit_list2.phtml b/views/mods/mod_produktbilder/produkt_edit_list2.phtml
index 39fcf81..07ca110 100644
--- a/views/mods/mod_produktbilder/produkt_edit_list2.phtml
+++ b/views/mods/mod_produktbilder/produkt_edit_list2.phtml
@@ -24,5 +24,4 @@
<?php } else { ?>
<p><?php echo __('Bisher keine Produktbilder hochgeladen.', 'wpsg'); ?></p>
- <?php } ?>
-
+ <?php } ?> \ No newline at end of file
diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml
index d3f7219..ce0c5e6 100644
--- a/views/produkt/addedit_general.phtml
+++ b/views/produkt/addedit_general.phtml
@@ -67,4 +67,4 @@
<?php echo wpsg_drawForm_Checkbox('posturl_verkauf', __('Beim Verkauf', 'wpsg'), wpsg_getStr($this->view['data']['posturl_verkauf'])); ?>
<?php echo wpsg_drawForm_Checkbox('posturl_bezahlung', __('Bei Bezahlung', 'wpsg'), wpsg_getStr($this->view['data']['posturl_bezahlung'])); ?>
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
-<?php } ?>
+<?php } ?> \ No newline at end of file
diff --git a/views/produkt/addedit_price.phtml b/views/produkt/addedit_price.phtml
index 6ca0f85..76733ff 100644
--- a/views/produkt/addedit_price.phtml
+++ b/views/produkt/addedit_price.phtml
@@ -13,4 +13,4 @@
<?php echo wpsg_drawForm_Text(__('Steueranteil', 'wpsg'), wpsg_ff(@$this->view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?>
<?php echo wpsg_drawForm_Checkbox('euleistungsortregel', __('Produkt unterliegt den EU-Leistungsortregeln', 'wpsg'), @$this->view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?>
<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender"><span class="glyphicon glyphicon-globe wpsg-glyphicon"></span><?php echo __('Länderverwaltung', 'wpsg'); ?></a>
-<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+<?php echo wpsg_drawForm_AdminboxEnd(); ?> \ No newline at end of file
diff --git a/views/produkttemplates/standard2.phtml b/views/produkttemplates/standard2.phtml
index fa7d911..c572f60 100644
--- a/views/produkttemplates/standard2.phtml
+++ b/views/produkttemplates/standard2.phtml
@@ -207,5 +207,4 @@
<?php $this->callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?>
-</div>
-
+</div> \ No newline at end of file