From 7c7d2e866c8bf883f52ac33c6fa65d54bc9fc5d6 Mon Sep 17 00:00:00 2001 From: hartmut Date: Thu, 7 Sep 2017 09:38:55 +0000 Subject: Korrektur Produktbilder->ImageHandler git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6474 0d5edaf7-2b12-4e95-93f4-047927463d4b --- .../productgroups_addedit_sidebar.phtml | 18 +- views/mods/mod_productgroups/list.phtml | 4 +- views/mods/mod_productgroups/show.phtml | 4 +- views/mods/mod_productview/productview.phtml | 211 ++++++++++++--------- .../mods/mod_produktartikel/header_facebook.phtml | 16 -- views/mods/mod_produktartikel/header_google.phtml | 13 -- views/mods/mod_produktartikel/schemaorg.phtml | 2 +- views/mods/mod_produktartikel/settings_edit.phtml | 9 - 8 files changed, 135 insertions(+), 142 deletions(-) delete mode 100644 views/mods/mod_produktartikel/header_facebook.phtml delete mode 100644 views/mods/mod_produktartikel/header_google.phtml (limited to 'views/mods') diff --git a/views/mods/mod_discount/productgroups_addedit_sidebar.phtml b/views/mods/mod_discount/productgroups_addedit_sidebar.phtml index d1bbec3..446ddb4 100644 --- a/views/mods/mod_discount/productgroups_addedit_sidebar.phtml +++ b/views/mods/mod_discount/productgroups_addedit_sidebar.phtml @@ -5,15 +5,9 @@ */ ?> -
-

-

- -

-
- view['wpsg_mod_discount']['data'][0]); ?> - view['wpsg_mod_discount']['data'][1]))); ?> - view['wpsg_mod_discount']['data'][2]))); ?> - view['wpsg_mod_discount']['data'][3]))); ?> -
-
\ No newline at end of file + + view['wpsg_mod_discount']['data'][0]); ?> + view['wpsg_mod_discount']['data'][1]))); ?> + view['wpsg_mod_discount']['data'][2]))); ?> + view['wpsg_mod_discount']['data'][3]))); ?> + \ No newline at end of file diff --git a/views/mods/mod_productgroups/list.phtml b/views/mods/mod_productgroups/list.phtml index 6164440..3491629 100644 --- a/views/mods/mod_productgroups/list.phtml +++ b/views/mods/mod_productgroups/list.phtml @@ -9,8 +9,6 @@ // Produkte die neben dem Namen angezeigt werden sollen $showP = 4; - if (!$this->hasMod("wpsg_mod_produktbilder")) die(__("Dieses Template erfordert das Modul mod_produktbilder.", "wpsg")); - ?> view['data'] as $k => $g) { ?> @@ -28,7 +26,7 @@
- +
diff --git a/views/mods/mod_productgroups/show.phtml b/views/mods/mod_productgroups/show.phtml index 7cf6529..2f6a0d0 100644 --- a/views/mods/mod_productgroups/show.phtml +++ b/views/mods/mod_productgroups/show.phtml @@ -6,8 +6,6 @@ * */ - if (!$this->hasMod("wpsg_mod_produktbilder")) die(__("Dieses Template erfordert das Modul mod_produktbilder.", "wpsg")); - ?>
@@ -17,7 +15,7 @@
- +
diff --git a/views/mods/mod_productview/productview.phtml b/views/mods/mod_productview/productview.phtml index 4e2ac50..8b58ba7 100644 --- a/views/mods/mod_productview/productview.phtml +++ b/views/mods/mod_productview/productview.phtml @@ -4,9 +4,9 @@ * Template für die Anzeige der Produkte * Es sollte nur Inhalt unter dem Div der Klasse wpsg_productview geändert werden, da dieses mittels AJAX ausgetauscht wird */ - + ?> -
+ @@ -17,6 +17,9 @@ view['wpsg_mod_productview']['products'])) { ?> + view['wpsg_mod_productview']['products'])[0]; ?> + + view['wpsg_mod_productview']['atts']['hideorder'])) { ?>
view['wpsg_mod_productview']['order']; ?> @@ -33,9 +36,10 @@
-
+
+ -
+ -
+ view['wpsg_mod_productview']['atts']['hideviewselect'])) { ?> + +
-
+
view['wpsg_mod_productview']['products'])) { ?> @@ -61,19 +67,25 @@
- - hasMod('wpsg_mod_produktbilder')) { ?> - callMod('wpsg_mod_produktbilder', 'getProductImage', array($oProduct->id, 520, 520, 'sz')); ?> - -
- - - + + imagehandler->getAttachmentID($oProduct->getProductKey()); + + ?> + + +
+
+ +
+ +
+
- -
+

getProductName(); ?>

@@ -85,48 +97,66 @@
-
- getOldPrice(); ?> - getPrice()) { ?> -
getPrice(), $this->get_option('wpsg_currency')); ?>
-
get_option('wpsg_currency')); ?>
- -
getPrice(), $this->get_option('wpsg_currency')); ?>
- -
- -
- getFrontendTaxview() == WPSG_BRUTTO) { ?> - Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> - getFrontendTaxview() == WPSG_NETTO) { ?> - Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> - -
+ canDisplayPrice()) { ?> +
+ getOldPrice(); ?> + getPrice()) { ?> +
getPrice(), $this->get_option('wpsg_currency')); ?>
+
get_option('wpsg_currency')); ?>
+ +
getPrice(), $this->get_option('wpsg_currency')); ?>
+ +
+ +
+ getFrontendTaxview() == WPSG_BRUTTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + getFrontendTaxview() == WPSG_NETTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + +
+ +

+ getShortDescription(); if (wpsg_isSizedString($shortDescription)) { ?> -
+

- - - + + canOrder()) { ?> + + + + +
-
+
- hasMod('wpsg_mod_produktbilder')) { ?> - callMod('wpsg_mod_produktbilder', 'getProductImage', array($oProduct->id, 520, 520, 'sz')); ?> - -
+ " alt="" /> - + $attachment_id = $this->imagehandler->getAttachmentID($oProduct->getProductKey()); + + ?> + + +
+ +
+ +
+
rating > 0) { ?> @@ -137,30 +167,38 @@
-
- getOldPrice(); ?> - getPrice()) { ?> -
get_option('wpsg_currency')); ?>
-
getPrice(), $this->get_option('wpsg_currency')); ?>
- -
getPrice(), $this->get_option('wpsg_currency')); ?>
- -
- -
- getFrontendTaxview() == WPSG_BRUTTO) { ?> - Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> - getFrontendTaxview() == WPSG_NETTO) { ?> - Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> - -
+ canDisplayPrice()) { ?> +
+ + getOldPrice(); ?> + getPrice()) { ?> +
get_option('wpsg_currency')); ?>
+
getPrice(), $this->get_option('wpsg_currency')); ?>
+ +
getPrice(), $this->get_option('wpsg_currency')); ?>
+ + +
+ +
+ getFrontendTaxview() == WPSG_BRUTTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + getFrontendTaxview() == WPSG_NETTO) { ?> + Versandkosten', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?> + +
+ +
+ +
+
- +
@@ -172,7 +210,11 @@ shortdesc; ?>
- + canOrder()) { ?> + + + +
@@ -190,26 +232,25 @@
- view['wpsg_mod_productview']['pages']) && $this->view['wpsg_mod_productview']['pages'] > 1) { ?> -
-
- view['wpsg_mod_productview']['page'] > 1) { ?> - - - view['wpsg_mod_productview']['pages']; $i ++) { ?> - view['wpsg_mod_productview']['page']) { ?> - - - - - - view['wpsg_mod_productview']['page'] < $this->view['wpsg_mod_productview']['pages']) { ?> - - -
-
- - + $this->view['wpsg_mod_productview']['pages'], + 'page' => $this->view['wpsg_mod_productview']['page'], + 'per_page' => $this->view['wpsg_mod_productview']['per_page'], + 'margin' => 2, + 'onclick' => array( + 'func' => 'wpsg_switchProductview', + 'args' => array( + $this->view['wpsg_mod_productview']['index'], + '#PAGE#' + ) + ) + )); + + ?> +
- -
\ No newline at end of file + + + diff --git a/views/mods/mod_produktartikel/header_facebook.phtml b/views/mods/mod_produktartikel/header_facebook.phtml deleted file mode 100644 index f8a8045..0000000 --- a/views/mods/mod_produktartikel/header_facebook.phtml +++ /dev/null @@ -1,16 +0,0 @@ - - - - -hasMod('wpsg_mod_produktbilder') && isset($this->view['data']['bilder'][0])) { ?> - - - - - \ No newline at end of file diff --git a/views/mods/mod_produktartikel/header_google.phtml b/views/mods/mod_produktartikel/header_google.phtml deleted file mode 100644 index 9d21a7a..0000000 --- a/views/mods/mod_produktartikel/header_google.phtml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/views/mods/mod_produktartikel/schemaorg.phtml b/views/mods/mod_produktartikel/schemaorg.phtml index daa8294..718ee80 100644 --- a/views/mods/mod_produktartikel/schemaorg.phtml +++ b/views/mods/mod_produktartikel/schemaorg.phtml @@ -8,7 +8,7 @@ ?>
view['data']['name']); ?> - +
view['data']['beschreibung']; ?>
\ No newline at end of file diff --git a/views/mods/mod_produktartikel/settings_edit.phtml b/views/mods/mod_produktartikel/settings_edit.phtml index d59b658..170b150 100644 --- a/views/mods/mod_produktartikel/settings_edit.phtml +++ b/views/mods/mod_produktartikel/settings_edit.phtml @@ -8,9 +8,7 @@ get_option('wpsg_mod_produktartikel_pathkey'), array('help' => 'mod_produktartikel_pathkey')); ?> get_option('wpsg_mod_produktartikel_showui'), array('help' => 'wpsg_mod_produktartikel_showui'))?> -hasMod('wpsg_mod_produktbilder')) { ?> get_option('wpsg_mod_produktartikel_postthumbnail'), array('help' => 'wpsg_mod_produktartikel_postthumbnail')); ?> - get_option('wpsg_mod_produktartikel_showHome'), array('help' => 'wpsg_mod_produktartikel_showHome')); ?> get_option('wpsg_mod_produktartikel_showCategory'), array('help' => 'wpsg_mod_produktartikel_showCategory')); ?> @@ -112,10 +110,3 @@ /* ]]> */ - -
- -get_option('wpsg_mod_produktartikel_facebook'), array('help' => 'wpsg_mod_produktartikel_facebook')); ?> -get_option('wpsg_mod_produktartikel_google'), array('help' => 'wpsg_mod_produktartikel_google')); ?> -get_option('wpsg_mod_produktartikel_twitter'), array('help' => 'wpsg_mod_produktartikel_twitter')); ?> - \ No newline at end of file -- cgit v1.2.3