From 0ccd23f52859f01c59ea3fdeba4004091612f8d5 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 1 Sep 2017 14:35:06 +0000 Subject: - Bilder / Varianten umgebaut vereinheitlicht und aufgeräumt - Produktbilder Modul durch "Imagehandler" ersetzt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6438 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/presentation.phtml | 9 +- views/css/admin.css | 10 + views/mailtemplates/html/order.phtml | 2 +- views/mods/mod_productvariants/admin_edit.phtml | 104 ++---- views/mods/mod_productvariants/produkt.phtml | 22 +- views/mods/mod_produktbilder/dummy.jpg | Bin 5946 -> 0 bytes .../produkt_addedit_content.phtml | 364 --------------------- .../mods/mod_produktbilder/produkt_edit_list.phtml | 24 -- .../mod_produktbilder/produkt_edit_list2.phtml | 27 -- .../mod_produktbilder/produkt_edit_list_MT.phtml | 27 -- views/mods/mod_produktbilder/settings_edit.phtml | 7 - views/produkt/images.phtml | 230 +++++++++++++ views/produkt/images_list.phtml | 36 ++ views/produkt/index.phtml | 30 +- views/warenkorb/basket.phtml | 2 +- views/warenkorb/overview.phtml | 2 +- 16 files changed, 336 insertions(+), 560 deletions(-) delete mode 100644 views/mods/mod_produktbilder/dummy.jpg delete mode 100644 views/mods/mod_produktbilder/produkt_addedit_content.phtml delete mode 100644 views/mods/mod_produktbilder/produkt_edit_list.phtml delete mode 100644 views/mods/mod_produktbilder/produkt_edit_list2.phtml delete mode 100644 views/mods/mod_produktbilder/produkt_edit_list_MT.phtml delete mode 100644 views/mods/mod_produktbilder/settings_edit.phtml create mode 100644 views/produkt/images.phtml create mode 100644 views/produkt/images_list.phtml (limited to 'views') diff --git a/views/admin/presentation.phtml b/views/admin/presentation.phtml index 2751d3d..0838259 100644 --- a/views/admin/presentation.phtml +++ b/views/admin/presentation.phtml @@ -30,8 +30,13 @@ '1' => __('Serverseitig + Javascript V1', 'wpsg'), '2' => __('Serverseitig + Javascript V2', 'wpsg') ), $this->get_option('wpsg_form_validation')); ?> - callMods('admin_presentation'); ?> - get_option('wpsg_showMwstAlways')); ?> + + shop->get_option('wpsg_imagehandler_basketimage')); ?> + shop->get_option('wpsg_imagehandler_overviewimage')); ?> + + callMods('admin_presentation'); ?> + + get_option('wpsg_showMwstAlways')); ?> get_option('wpsg_showArticelnumber')); ?> get_option('wpsg_hideBasketCountrySelect')); ?> diff --git a/views/css/admin.css b/views/css/admin.css index 1c9ada8..9ff2da4 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -150,6 +150,16 @@ .wpsg_admin_submenu input[type="submit"], .wpsg_admin_submenu input[type="button"] { width:100%; margin-bottom:10px !important; } #wpsg-bs.wpsg_products .wpsg_productgroup_link_wrap { float:left; } .wpsg_mod_productvariants_productimage_row .mark { display:inline-block; background-color:#FFF; border:2px solid #444444;} +.wpsg_be_imagelist_image { width:100px; } +.wpsg_be_productindex_image { border:0px !important; width:75px; background-color:#FFFFFF; } + +/* Bild allgemein */ +.box_img_wrap { position:relative; padding-top:100%; border:1px solid #000000; background:transparent; } +.box_img_wrap img {border:0px !important; position:absolute; left:50%; top:50%; max-height:100% !important; max-width:100%!important; height:auto!important; width:auto!important; margin:0px !important; + transform:translateY(-50%) translateX(-50%); + -ms-transform:translateY(-50%) translateX(-50%); + -webkit-transform:translateY(-50%) translateX(-50%); +} /* * Produktbackend diff --git a/views/mailtemplates/html/order.phtml b/views/mailtemplates/html/order.phtml index 45ae41c..558dd3b 100644 --- a/views/mailtemplates/html/order.phtml +++ b/views/mailtemplates/html/order.phtml @@ -18,7 +18,7 @@ callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['product_id'])); - $k = $this->view['variant']['id']; - $kv = $vari['id']; - $temp = $this->callMod('wpsg_mod_productvariants', 'getVariImages', array($this->view['product_id'], $k, $vari['iid'])); + + $arAttachmentIDs = $this->imagehandler->getAttachmentIDs($this->view['product_id'], $vari['id']); + ?> - + + + + @@ -245,54 +237,26 @@ - - - - - - - -

- - -

- - view['data']['id'])) { ?> -
-
- - - - - - - \ No newline at end of file diff --git a/views/mods/mod_produktbilder/produkt_edit_list.phtml b/views/mods/mod_produktbilder/produkt_edit_list.phtml deleted file mode 100644 index d0aaf12..0000000 --- a/views/mods/mod_produktbilder/produkt_edit_list.phtml +++ /dev/null @@ -1,24 +0,0 @@ - -view['ProduktBilder']) > 0) { ?> - - view['ProduktBilder'] as $b) { ?> - -
- - <?php echo wpsg_hspc($b); ?> - - -
- - -
- - -

- \ No newline at end of file diff --git a/views/mods/mod_produktbilder/produkt_edit_list2.phtml b/views/mods/mod_produktbilder/produkt_edit_list2.phtml deleted file mode 100644 index 07ca110..0000000 --- a/views/mods/mod_produktbilder/produkt_edit_list2.phtml +++ /dev/null @@ -1,27 +0,0 @@ - - - view['ProduktBilder2']) && (sizeof($this->view['ProduktBilder2']) > 0)) { ?> - - view['ProduktBilder2'] as $b) { ?> - -
- - - <?php echo wpsg_hspc($b['fname']); ?> - - - -
- - -
- - -

- \ No newline at end of file diff --git a/views/mods/mod_produktbilder/produkt_edit_list_MT.phtml b/views/mods/mod_produktbilder/produkt_edit_list_MT.phtml deleted file mode 100644 index 3589f68..0000000 --- a/views/mods/mod_produktbilder/produkt_edit_list_MT.phtml +++ /dev/null @@ -1,27 +0,0 @@ - - - view['ProduktBilder_MT']) && (sizeof($this->view['ProduktBilder_MT']) > 0)) { ?> - - view['ProduktBilder_MT'] as $b) { ?> - -
- - - <?php echo wpsg_hspc($b['fname']); ?> - - - -
- - -
- - -

- \ No newline at end of file diff --git a/views/mods/mod_produktbilder/settings_edit.phtml b/views/mods/mod_produktbilder/settings_edit.phtml deleted file mode 100644 index b34edc6..0000000 --- a/views/mods/mod_produktbilder/settings_edit.phtml +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/views/produkt/images.phtml b/views/produkt/images.phtml new file mode 100644 index 0000000..3f29c65 --- /dev/null +++ b/views/produkt/images.phtml @@ -0,0 +1,230 @@ + + + + + + +
+
+

+
+
+ + view['data']['id'] > 0) { ?> + + + +
view['strProductList']; ?>
+ +
+
+
+

+ + + + + + +

+ + +
+
+
diff --git a/views/produkt/images_list.phtml b/views/produkt/images_list.phtml new file mode 100644 index 0000000..9ccc60f --- /dev/null +++ b/views/produkt/images_list.phtml @@ -0,0 +1,36 @@ + + +view['ProduktBilder_MT']) && (sizeof($this->view['ProduktBilder_MT']) > 0)) { ?> + + view['ProduktBilder_MT'] as $b) { ?> + +
+ + + +
+ + + +
+ + + + +
+ + + +
+ + + +

+ + \ No newline at end of file diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index d862d08..878dba4 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -34,10 +34,8 @@ view['arData'])) { ?> - hasMod('wpsg_mod_produktbilder')) { ?> - @@ -153,9 +151,7 @@
- hasMod('wpsg_mod_produktbilder') && wpsg_isSizedInt($this->get_option('wpsg_mod_produktbilder_overviewimage'))) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($p['id']))); ?> + hasMod('wpsg_mod_produktbilder') && wpsg_isSizedInt($this->get_option('wpsg_imagehandler_overviewimage'))) { $arBilder = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($p['id']))); ?> diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml index 1c403c1..987e076 100644 --- a/views/mods/mod_productvariants/admin_edit.phtml +++ b/views/mods/mod_productvariants/admin_edit.phtml @@ -173,29 +173,27 @@
  - - view['variant']['id'] $vari $var $kv $_REQUEST['pic'] - $file2 = $b['basenameori']; - $href = wp_get_attachment_image_src($b['post_id'], Array(25, 25)); - ?> - pic" id="" data-pid="" - onclick="return wpsg_vp_vari_setPic(this, , , '', , );"> - - - + + + + + pic" id="" onclick="return wpsg_vp_vari_setPic(this, view['variant']['id']; ?>, , '', view['product_id']; ?>);"> + + + + + + - - - - - -
- hasMod('wpsg_mod_produktbilder')) { ?> - @@ -175,25 +171,17 @@ view['arData'] as $oProduct) { $d = $oProduct->data; ?> - hasMod('wpsg_mod_produktbilder')) { ?> -
- callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($d['id'], 40, 40, 'c')); - $img = $this->callMod('wpsg_mod_produktbilder', 'getProductImage_MT', array($d['id'])); - - if ($img !== false) - { - - echo ''; - echo ''; - echo ''; - - } - - ?> + + imagehandler->getAttachmentID($oProduct->getProductKey()); ?> + + +
+ +
+ + 		isMultiLingual()) { ?> diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index 4f41e09..30ff26e 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -43,7 +43,7 @@ view['$bPicture'] = false; ?> - get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { + get_option('wpsg_imagehandler_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']); else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id']))); diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml index f8036a0..ef87d99 100644 --- a/views/warenkorb/overview.phtml +++ b/views/warenkorb/overview.phtml @@ -122,7 +122,7 @@ view['$bPicture'] = false; ?> - get_option('wpsg_mod_produktbilder_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { + get_option('wpsg_imagehandler_basketimage') == '1' && $this->hasMod('wpsg_mod_produktbilder')) { if (wpsg_isSizedString($product_data['varianten_image'])) $arImages = array($product_data['varianten_image']); else $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktID($product_data['id']))); -- cgit v1.2.3