From eb4343b2485dc88cbb4d4f1e5d53b03711b54e9f Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Tue, 6 Jun 2017 15:10:54 +0000 Subject: - Aufräumen / Funktionen in Produktansicht ohne Theme überarbeitet - Basket ohne Tabellen angefangen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6314 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/ueber.phtml | 2 +- views/css/frontend.css | 153 +++---- views/js/frontend.js | 22 + views/mods/mod_productvariants/frontend.js | 86 +--- views/mods/mod_produktbilder/settings_edit.phtml | 6 - views/produkttemplates/bildertest.phtml | 42 -- views/produkttemplates/produktseite.phtml | 135 ------ views/produkttemplates/standard.phtml | 527 ++++++++++------------- views/produkttemplates/standard2.phtml | 210 --------- views/produkttemplates/standard_1544.phtml | 435 ------------------- views/produkttemplates/standard_ajax.phtml | 196 --------- views/produkttemplates/standard_alt.phtml | 327 -------------- views/produkttemplates/standard_login.phtml | 177 -------- views/produkttemplates/standard_mt.phtml | 341 --------------- views/warenkorb/ajaxDialog.phtml | 217 ++++------ views/warenkorb/basket.phtml | 50 +++ views/warenkorb/messageDialog.phtml | 42 +- 17 files changed, 463 insertions(+), 2505 deletions(-) delete mode 100644 views/produkttemplates/bildertest.phtml delete mode 100644 views/produkttemplates/produktseite.phtml delete mode 100644 views/produkttemplates/standard2.phtml delete mode 100644 views/produkttemplates/standard_1544.phtml delete mode 100644 views/produkttemplates/standard_ajax.phtml delete mode 100644 views/produkttemplates/standard_alt.phtml delete mode 100644 views/produkttemplates/standard_login.phtml delete mode 100644 views/produkttemplates/standard_mt.phtml diff --git a/views/admin/ueber.phtml b/views/admin/ueber.phtml index b3f5986..7d2398a 100644 --- a/views/admin/ueber.phtml +++ b/views/admin/ueber.phtml @@ -84,7 +84,7 @@

- + diff --git a/views/css/frontend.css b/views/css/frontend.css index 9d43c77..af7cda9 100644 --- a/views/css/frontend.css +++ b/views/css/frontend.css @@ -3,9 +3,13 @@ /* Allgemein */ .wpsg_clear { clear:both; } #wpsg_error, #wpsg_message { margin-bottom:1rem; } -#wpsg_message p, #wpsg_error p, #wpsg_notice p { background-color:#FAFAFA; margin-bottom:4px; padding:3px 0px 3px 8px; } +#wpsg_message li, #wpsg_error li, #wpsg_notice li, +#wpsg_message p, #wpsg_error p, #wpsg_notice p { margin-bottom:4px; padding:3px 0px 3px 8px; } +#wpsg_message li, #wpsg_message p { border-left:4px solid #7AD03A; } +#wpsg_notice li, #wpsg_notice p { border-left:4px solid #FDF60A; } +#wpsg_error li, #wpsg_error p { border-left:4px solid #DD3D36; } .wpsg_error { border-color:#DD3D36; } .wpsg { } @@ -15,43 +19,20 @@ label.wpsg_error { position:absolute; right:2px; top:-2px; color:#DD3D36; } input.wpsg_error { border-color:red !important; } .wpsg_spacer { width:100%; height:1px; background-color:#EAEAEA; margin-bottom:1rem; } .wpsg_noscroll { overflow:hidden; } -#TB_ajaxContent { width:100% !important; } .wpsg_upper { vertical-align:top; font-size:60%; } - /* Basket Widget */ .wpsg_basket_widget .wpshopgermany_linktokasse { float:right; margin-top:1rem; } /* Basket */ -.wpsg_basket { margin-bottom:1rem; } -.wpsg_basket h2 { } -.wpsg_basket table { margin-top:1rem; width:100%; } -.wpsg_basket table th { } -.wpsg_basket .wpsg_basket_removelink { text-decoration:none; border:0px !important; } -.wpsg_basket .wpsg_cell_number { padding-left:0.3rem; padding-right:0.3rem; text-align:center; min-width:20px; } -.wpsg_basket .wpsg_cell_number img { max-width:auto !important; display:inline-block; } -.wpsg_basket .wpsg_cell_menge { text-align:center; } -.wpsg_basket .wpsg_cell_menge input { text-align:center; } -.wpsg_basket .wpsg_cell_preis { text-align:right; } -.wpsg_basket .wpsg_cell_gesamtpreis { text-align:right; } -.wpsg_basket .wpsg_cell_summe_value { text-align:right; } -.wpsg_basket .wpsg_cell_shipping_value { text-align:right; } -.wpsg_basket .wpsg_cell_shipping_label select, -.wpsg_basket .wpsg_cell_shipping_label span { float:right; width:150px;clear:right; } -.wpsg_basket .wpsg_cell_shipping_label select.set_shipping { margin-bottom:5px; } -.wpsg_basket .wpsg_cell_payment_label select, -.wpsg_basket .wpsg_cell_payment_label span { float:right; width:150px; } -.wpsg_basket .wpsg_cell_payment_value { text-align:right; } -.wpsg_basket .wpsg_cell_gesamtsumme_value { text-align:right; } -.wpsg_basket .wpsg_cell_deliverytime_value { text-align:right; } -.wpsg_basket .wpsg_cell_name { vertical-align:middle; } -.wpsg_basket .wpsg_cell_name .wpsg_basket_productimage { display:inline; padding-right:0.2rem; vertical-align:baseline; } -.wpsg_basket .wpsg_cell_mwst { text-align:center; min-width:60px; } -.wpsg_basket .wpsg_cell_mwst_value { text-align:right; } -.wpsg_basket .wpsg_cell_weight_value { text-align:right; } -.wpsg_basket .wpsg_checkoutbutton { float:right; } -.wpsg_basket .wpsg_cell_gesamtsumme_value { font-weight:bold; } -.wpsg_basket .wpsg_refreshbutton, .wpsg_basketbutton { float:left; } +.basket_product_wrap {} +.basket_product_wrap .basket_product_row { display:flex; align-items:top; border-bottom:1px solid #EAEAEA; padding-bottom:1em; margin-bottom:1em; } +.basket_product_wrap .basket_product_row .product_shortdesc { margin-top:0.5em; } +.basket_product_wrap .basket_product_row .productimage { max-width:150px; padding-right:0.75em; } +.basket_product_wrap .basket_product_row .product_content { width:100%; display:flex; flex-direction:column; justify-content:space-between; } +.basket_product_wrap .basket_product_row .product_action { display:flex; width:100%; justify-content:space-between; align-items:center; } +.basket_product_wrap .basket_product_row .product_action .amount { margin-top:0.5em; margin-bottom:0.5em; } +.basket_product_wrap .basket_product_row .product_action .price_total { font-weight:bold; } /* Checkout + Request*/ .wpsg_checkout .wpsg_checkoutblock { width:100%; clear:both; margin-bottom:2px; position:relative; width:100%; } @@ -116,9 +97,6 @@ input.wpsg_error { border-color:red !important; } /* Bestellvariablen */ .wpsg_checkout .wpsg_mod_ordervars_field { display:inline; } -/* Produktvariablen */ -.wpsg_basket .wpsg_basket_productvars input[type="text"], .wpsg_basket .wpsg_basket_productvars select { width:100%; } - /* Profilseite */ .wpsg_profil .wpsg_pwdvergessen_link { line-height:30px; } .wpsg_profil .wpsg_mod_kundenverwaltung_login, .wpsg_checkout .wpsg_mod_kundenverwaltung_login { float:right; } @@ -142,33 +120,37 @@ input.wpsg_error { border-color:red !important; } .wpsg_checkout .wpsg_mod_shippingadress { margin-bottom:1rem; } /* Produkttemplate */ -.wpsg_produkt_wrapper { margin:5px -10px 5px -10px; padding:10px; width:100%; line-height:1.5em; box-sizing:content-box; } -.wpsg_produkt_wrapper .wpsg_produkt_produktbilder { float:left; margin-right:1rem; margin-bottom:1rem; } -.wpsg_produkt_wrapper .wpsg_product_afterimage { } -.wpsg_produkt_wrapper .wpsg_product_afterimage .wpsg_producttitle { clear:none; } -.wpsg_produkt_wrapper .wpsg_add_basket { margin:1rem 0; float:right; } -.wpsg_produkt_wrapper .wpsg_produkt_add_basket_wrapper { clear:both; float:left; margin:1rem 0 0 0; } -.wpsg_produkt_wrapper .wpsg_label { display:inline; } -.wpsg_produkt_wrapper .wpsg_value { display:inline; } -.wpsg_produkt_wrapper .wpsg_preis_prediscount { text-decoration: line-through; } -.wpsg_produkt_wrapper .wpsg_menge { width:auto; } .wpsg_productform { position:relative; } -.wpsg_productform .wpsg_product_layer { z-index:1000; background-color:rgba(125, 125, 125, 0.5); position:absolute; left:-10px; top:-10px; width:100%; height:100%; padding:20px; } -.wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; top:50%; margin-left:-8px; margin-top:-5.5px; } - -/* Ajax Meldung über das Produkttemplate */ -#wpsg_basket_ajax_message { z-index:2000; position:absolute; top:55px; width:100%; position:fixed; } -#wpsg_basket_ajax_message .wpsg_basket_ajax_message_content { - width:800px; margin:auto; background-color:white; padding:25px; text-align:center; - -webkit-border-radius:15px; - -moz-border-radius:15px; - border-radius:15px; +.wpsg_productform .wpsg_produkt_wrapper .wpsg_productimages { float:left; margin-right:0.75em; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_produkt_preishinweis { font-size:0.75em; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productview_oldprice { text-decoration:line-through; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productview_price { font-weight:bold; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_produkt_shortdescription { margin-top:0.75em; margin-bottom:0.75em; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_only_store { margin-top:0.75em; margin-bottom:0.75em; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap { margin-top:0.75em; margin-bottom:0.75em; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap select, +.wpsg_productform .wpsg_produkt_wrapper .wpsg_mod_productvariants_product_wrap input { width:100%; box-sizing:border-box; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_informationarea { margin-top:1.5em; margin-bottom:1.5em; } +.wpsg_productform .wpsg_produkt_wrapper label { font-weight:bold; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="text"] { width:48%; float:left; box-sizing:border-box; padding:0.7em; line-height:1.5em; font-size:1rem; } +.wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="submit"] { width:48%; float:right; box-sizing: border-box; padding:0.7em; line-height:1.5em; font-size:1rem; border:1px solid transparent; border-radius:3px; } +.wpsg_productform .wpsg_product_layer { position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.25); padding:0.75em; margin:-0.75em; box-sizing:content-box; } +.wpsg_productform .wpsg_product_layer img { position:absolute; left:50%; margin-left:-8px; top:50%; margin-top:-5px; } +.wpsg_productform .wpsg_produkt_produktbilder { max-width:200px; } + +@media (max-width:400px) { + + .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="text"] { width:28%; } + .wpsg_productform .wpsg_produkt_wrapper .wpsg_product_buttonarea input[type="submit"] { width:68%; } + +} + +@media (max-width:600px) { + + .wpsg_productform .wpsg_productimages { width:100%; } + .wpsg_productform .wpsg_produkt_produktbilder { max-width:100%; } + } -#wpsg_basket_ajax_layer { z-index:199; position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.75); position:fixed; } -#wpsg_basket_ajax_message .wpsg_basket_ajax_message_content_success { color:green; } -#wpsg_basket_ajax_message .wpsg_button_continue_shopping { float:left; } -#wpsg_basket_ajax_message .wpsg_button_basket { float:right; } -#wpsg_basket_ajax_message .wpsg_button_wrap { margin-top:4rem; } /* Varianten */ .wpsg_produkt_wrapper .wpsg_vp_field { clear:both; margin-bottom:1rem; } @@ -188,12 +170,6 @@ input.wpsg_error { border-color:red !important; } .wpsg_basket_widget table .wpsg_cell_amount { text-align:right; padding-right:0.2rem; } .wpsg_basket_widget table .wpsg_row_summary .wpsg_cell_amount { font-weight:bold; } -/* Modul Gutscheine */ -.wpsg_basket .wpsg_cell_gutschein { vertical-align:middle; } -.wpsg_basket .wpsg_cell_gutschein input[type="submit"] { float:right; } -.wpsg_basket .wpsg_cell_gutschein input[type="text"] { float:right; margin-top:2px; margin-right:10px; vertical-align:baseline; } -.wpsg_basket .wpsg_cell_gutschein label { line-height:35px; } - /* Modul Kundenverwaltung */ .wpsg_mod_kundenverwaltung_widget input[type="text"], .wpsg_mod_kundenverwaltung_widget input[type="password"] { width:100%; margin-bottom:0.5rem; } .wpsg_mod_kundenverwaltung_widget input[type="submit"] { float:right; } @@ -261,7 +237,6 @@ input.wpsg_error { border-color:red !important; } .wpsg_mod_request_requestpage .wpsg_cell_action { width:30px; text-align:center; } .wpsg_mod_request_requestpage .wpsg_cell_amount { width:125px; } .wpsg_mod_request_requestpage .wpsg_cell_sumprice { text-align:right; width:200px; } -.wpsg_mod_request_requestpage .wpsg_basket_productimage { float:left; margin-right:5px; } .wpsg_mod_request_requestpage .wpsg_cell_total_brutto, .wpsg_mod_request_requestpage .wpsg_cell_total_netto { text-align:right; } .wpsg_mod_request_requestpage .wpsg_checkout_typ_3 input { margin-right: 5px; width: auto; } @@ -270,30 +245,6 @@ input.wpsg_error { border-color:red !important; } .wpsg_mod_request_requestpage h2 { margin-top:2rem; margin-bottom:1rem; } .requestlist_ajax_wrap { padding-bottom:2rem; } -/* Modul Zubehörprodukte */ -.wpsg_mod_relatedproducts_basket { margin-top:2rem; } - -/* Progress bar -.steps { list-style:none; margin:0; padding:10px 0; overflow:hidden; font-family:'inherit',sans-serif; font-size:1.5rem; width:100%; height:auto; line-height:20px; font-weight:bold; counter-reset:li; } -.steps > a, .steps > p { float:left; margin:5px 0;} -.steps a, .steps p { list-style-image:none; list-style-type:none; margin-left:0; text-align:center; color:#bbb; background:#f2f2f2; position:relative; margin-left:43px; border-bottom:medium none !important; } - -.steps a:after, .steps p:after { position:absolute; top:50%; left:100%; content:" "; height:0; width:0; border:solid transparent; border-left-color:#f2f2f2; border-width:19px; margin-top:-19px; } -.steps a span:after, .steps p span:after { position:absolute; top:50%; right:100%; content:" "; height:0; width:0; border:solid #f2f2f2; border-left-color:transparent; border-width:19px; margin-top:-19px; } - -.steps a span, .steps p span { display:block; padding:9px 28px 9px 9px; } -.steps a span:before, .steps p span:before { counter-increment:li; } - -.steps a.current, .steps p.current { color:#3a3a3a; background:#c9c9c9; } -.steps a.current:after, .steps p.current:after { border-left-color:#c9c9c9; } -.steps a.current span:after, .steps p.current span:after { border-color:#c9c9c9; border-left-color:transparent; } - -.steps a.step1, .steps p.step1 { z-index:9; } -.steps a.step2, .steps p.step2 { z-index:8; } -.steps a.step3, .steps p.step3 { z-index:7; } -.steps a.step4, .steps p.step4 { z-index:6; } -*/ - .wpsg_progress { padding:0px; margin:0px; width:100%; margin-bottom:100px; margin-top:30px; } .wpsg_progress:after { border:1px solid #C5C5C5; height:10px; background-color:#F2F2F2; box-sizing:border-box; display:block; width:100%; content:" "; } .wpsg_progress span.step { width:25%; display:block; float:left; list-style:none; position:relative; } @@ -365,21 +316,15 @@ input.wpsg_error { border-color:red !important; } .wpsg_mod_productview-order-layer a.selected, .wpsg_mod_productview-order-layer a:hover { text-decoration:none; color:#FFFFFF; background-color:#29556E; } -@media screen and (max-width: 600px) { - - #wpsg_basket_ajax_message .wpsg_basket_ajax_message_content { width:80%; } - #wpsg_basket_ajax_message .wpsg_button_basket, - #wpsg_basket_ajax_message .wpsg_button_continue_shopping { width:100%; margin-top:2rem; } - .wpsg_progress span.step > .text { visibility:hidden; } - -} - -@media screen and (max-width: 400px) { +/* Dialog für Meldungen wenn nicht auf einer Shop Seite / Warenkorbmeldung BEGIN */ +#wpsg_ajax_layer { position:fixed; z-index:1000; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.75); display:flex; justify-content:center; align-items:center; } +#wpsg_ajax_layer .wpsg_ajax_message_content { background-color:#FFFFFF; padding:1.5rem; text-align:center; } +#wpsg_ajax_layer .wpsg_ajax_message_content li { list-style:none; } - .wpsg .wpsg_button { padding-left:10px; padding-right:10px; } +@media screen and (max-width: 320px) { - .wpsg_basket .wpsg_cell_gutschein label { width:100%; display:block; } - .wpsg_basket #wpsg_gutschein_input { float:left; } + #wpsg_ajax_layer .wpsg_ajax_message_content { width:300px; } } +/* Dialog für Meldungen wenn nicht auf einer Shop Seite / Warenkorbmeldung ENDE */ diff --git a/views/js/frontend.js b/views/js/frontend.js index b4b0119..e354123 100644 --- a/views/js/frontend.js +++ b/views/js/frontend.js @@ -38,6 +38,28 @@ return false; } + + /** + * Sperrt die Funktionen im Produkttemplate, während einer Ajax Aktion + * @param template_index + */ + function wpsg_blockProductTemplate(template_index) + { + + jQuery('#wpsg_produktform_' + template_index).append('
' + wpsg_ajax.label_pleasewait + '
'); + + } // function wpsg_blockProductTemplate(template_index) + + /** + * Entsperrt die Funktionen im Produkttemplate nach einer Ajax Aktion + * @param template_index + */ + function wpsg_unblockProductTemplate(template_index) + { + + jQuery('#wpsg_produktform_' + template_index + ' .wpsg_product_layer').remove(); + + } // function wpsg_unblockProductTemplate(template_index) wpsg_numberformat = function (number, decimals, dec_point, thousands_sep) { diff --git a/views/mods/mod_productvariants/frontend.js b/views/mods/mod_productvariants/frontend.js index 9e50d0b..94cae44 100644 --- a/views/mods/mod_productvariants/frontend.js +++ b/views/mods/mod_productvariants/frontend.js @@ -1,95 +1,23 @@ - - var wpsg_vp_vari = new Array(); - - function wpsg_vp_switch(product_id, product_index, elem) - { - /* - var var_key = 'pv_' + product_id + "|"; - //alert('Länge: ' + wpsg_vp_vari[product_id].length); - - for (var i = 0; i < wpsg_vp_vari[product_id].length; i ++) - { - - vkey1 = i + ":"; - vkey2 = ''; - - if (wpsg_vp_vari[product_id][i] == "select") - { - vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + " #wpsg_vpfield_" + product_id + "_" + i).val(); - } - else if (wpsg_vp_vari[product_id][i] == "radio") - { - vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + ' input[name="wpsg_vp[' + i + ']"]:checked').val(); - } - else if (wpsg_vp_vari[product_id][i] == "checkbox") - { - vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + ' input[name="wpsg_vp[' + i + ']"]:checked').length; - } - else if (wpsg_vp_vari[product_id][i] == "image") - { - vkey2 = jQuery('#wpsg_produktform_' + product_index + ' .wpsg_produkt_' + product_id + ' .wpsg_mod_productvariants_imageselect_' + i + ' .akt').attr("data-wpsg-id"); - } - - if (vkey2 != '') { - if (wpsg_vp_vari[product_id][i] == "image") - jQuery('#wpsg_vp_' + i).val(vkey2); - var_key += vkey1 + vkey2; - if (i < (wpsg_vp_vari[product_id].length - 1)) var_key += "|"; - } - } - */ - //console.log(jQuery('#wpsg_produktform_' + product_index).serialize()); - //console.log(var_key); - //return; - - v1 = jQuery(elem).attr("data-wpsg-id"); - //v2 = jQuery(elem).parent().find('input').val(); - jQuery(elem).parent().find('input').val(v1); - //alert('v1=' + v1 + ' v2=' + v2); - - jQuery('#wpsg_produktform_' + product_index).append('
' + wpsg_ajax.label_pleasewait + '
'); - jQuery.ajax( { - 'url': wpsg_ajax.ajaxurl, - 'method': 'get', - 'data': { - 'action': 'wpsg_productvariants_switch', - 'wpsg_post_id': jQuery('#wpsg_produktform_' + product_index + ' input[name="wpsg_post_id"]').val(), - 'quantity': jQuery('#wpsg_menge_' + product_index).val(), - 'template': jQuery('#wpsg_produktform_' + product_index + ' input[name="wpsg[template]"]').val(), - 'referer': jQuery('#wpsg_produktform_' + product_index + ' input[name="myReferer"]').val(), - 'form_data': jQuery('#wpsg_produktform_' + product_index).serialize(), - // 'product_key': var_key, - 'product_index': product_index - }, - 'success': function(data) { - - jQuery('#wpsg_produktform_' + product_index).replaceWith(data); - - } - } ); - - } // function wpsg_vp_switch(produkt_id) - function wpsg_mod_productvariants_reload(event) { - var product_index = jQuery(event.target).parents('.wpsg_mod_productvariants_product_wrap').attr('wpsg-productindex'); + var template_index = jQuery(event.target).closest('.wpsg_mod_productvariants_product_wrap').attr('wpsg-productindex'); - //jQuery('#wpsg_produktform_' + product_index).append('
' + wpsg_ajax.label_pleasewait + '
'); - + wpsg_blockProductTemplate(template_index); + jQuery.ajax( { 'url': wpsg_ajax.ajaxurl, 'method': 'get', 'data': { 'action': 'wpsg_productvariants_switch', - 'wpsg_post_id': jQuery('#wpsg_produktform_' + product_index + ' input[name="wpsg_post_id"]').val(), - 'form_data': jQuery('#wpsg_produktform_' + product_index).serialize(), - 'product_index': product_index + 'wpsg_post_id': jQuery('#wpsg_produktform_' + template_index + ' input[name="wpsg_post_id"]').val(), + 'form_data': jQuery('#wpsg_produktform_' + template_index).serialize(), + 'product_index': template_index }, 'success': function(data) { - jQuery('#wpsg_produktform_' + product_index).replaceWith(data); + jQuery('#wpsg_produktform_' + template_index).replaceWith(data); } } ); diff --git a/views/mods/mod_produktbilder/settings_edit.phtml b/views/mods/mod_produktbilder/settings_edit.phtml index 1c035ef..b34edc6 100644 --- a/views/mods/mod_produktbilder/settings_edit.phtml +++ b/views/mods/mod_produktbilder/settings_edit.phtml @@ -5,9 +5,3 @@ */ ?> -get_option('wpsg_mod_produktbilder_width'), array('help' => 'wpsg_mod_produktbilder_width')); ?> -get_option('wpsg_mod_produktbilder_height'), array('help' => 'wpsg_mod_produktbilder_height')); ?> -callMod('wpsg_mod_produktbilder', 'getImageModes'), $this->get_option('wpsg_mod_produktbilder_mode'), array('help' => 'wpsg_mod_produktbilder')); ?> -get_option('wpsg_mod_produktbilder_quality'), array('help' => 'wpsg_mod_produktbilder_quality','hint' => __('0 = Schlechte Qualität, 100 = Gute Qualität', 'wpsg'))); ?> - - \ No newline at end of file diff --git a/views/produkttemplates/bildertest.phtml b/views/produkttemplates/bildertest.phtml deleted file mode 100644 index 7bddb75..0000000 --- a/views/produkttemplates/bildertest.phtml +++ /dev/null @@ -1,42 +0,0 @@ -callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])); - -?> - -
- -
-
- - - -

:

- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- - - -
\ No newline at end of file diff --git a/views/produkttemplates/produktseite.phtml b/views/produkttemplates/produktseite.phtml deleted file mode 100644 index 17e4087..0000000 --- a/views/produkttemplates/produktseite.phtml +++ /dev/null @@ -1,135 +0,0 @@ -view['data']); - - // Damit keine Zubehörprodukte ausgegeben werden - //$this->noReleatedProducts = true; - -?> -
-
- -
- -

view['data']['name']); ?>

- - - hasMod('wpsg_mod_produktbilder')) { ?> -
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> - -
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?> - getTemplateIndex(); ?>" src="callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="" />*/?> -
- - - - - -
-
- - - - get_option('wpsg_showArticelnumber') == '1') { ?> -
- : view['data']['anr']); ?> -
- - -
- - - view['data']['preis']); ?> get_option('wpsg_currency'); ?>view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> -
- - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - -
- - - - - hasMod('wpsg_mod_fuellmenge')) { ?> - -
- view['data']['id'].'">'.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], - ''.wpsg_ff($this->view['data']['fmenge_preis']).' '. $this->get_option('wpsg_currency'), - wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) - ); ?> -
- - - - - - hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - -
- callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?> -
- - - - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> -
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> -
- - - - -
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id'])); ?> -
- - - - -
- - - callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?> - - -
- -
- - view['data']['beschreibung'])) > 0) { ?> -
- -
- view['data']['beschreibung']; ?> -
- -
- - - callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
\ No newline at end of file diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml index c6353f7..1520c38 100644 --- a/views/produkttemplates/standard.phtml +++ b/views/produkttemplates/standard.phtml @@ -13,337 +13,272 @@ $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['product_id'])); if (!wpsg_isSizedArray($arImages)) $arImages = array(); -?> -
+?> -
+
+ + + - - -
- - titleDisplayed) { ?> -

getProductName($this->view['data']['id']); ?>

- +
- callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
+ titleDisplayed) { ?> +

getProductName($this->view['data']['id']); ?>

+ - 0) { ?> + callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - - - - - callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
- -
-
- - hasMod('wpsg_mod_produktbilder')) { ?> -
- get_option('wpsg_mod_produktbilder_width'); - $pbh = $this->get_option('wpsg_mod_produktbilder_height'); - $pbm = $this->get_option('wpsg_mod_produktbilder_mode'); - $pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['id'])); - ?> - - - view['data']['varianten_image']) || $b['basename'] == $this->view['data']['varianten_image']) { ?> -
- - - -
- - - - - -
-
- - -
-
+
-
+ callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
- + + +
+ +
+ + + + -
+ 1) { for ($i = 1; $i < sizeof($arImages); $i ++) { ?> + + + - get_option('wpsg_showArticelnumber') == '1') { ?> -
- : view['data']['anr']); ?>
- get_option('wpsg_mod_produktartikel_ean'))) {?> - :view['data']['ean']); ?>
- - get_option('wpsg_mod_produktartikel_gtin'))) {?> - :view['data']['gtin']); ?>
-
- - - - callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - -
- - - - view['data']['preis'], $this->get_option('wpsg_currency')); ?> - view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> - - hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> -
- : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> -
- -
- - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
+
+ +
+ + + + get_option('wpsg_showArticelnumber') == '1') { ?> +
+ : view['data']['anr']); ?>
+ get_option('wpsg_mod_produktartikel_ean'))) {?> + :view['data']['ean']); ?>
+ + get_option('wpsg_mod_produktartikel_gtin'))) {?> + :view['data']['gtin']); ?>
+
+ + + + view['oProduct']->canDisplayPrice()) { ?> - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - -
- - - - - getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> +
+ - - - -
-

- view['data']['shortdesc']; ?> -
+ -
- - hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?> -
- - -
- - - - - hasMod('wpsg_mod_fuellmenge')) { ?> + view['oProduct']->getOldPrice(); ?> + view['oProduct']->getPrice()) { ?> + view['oProduct']->getPrice(), $this->get_option('wpsg_currency')); ?> + get_option('wpsg_currency')); ?> + + view['oProduct']->getPrice(), $this->get_option('wpsg_currency')); ?> + -
- - '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], - ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', - wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) - ); ?> -
- - - -
- -
- - hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - - - callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) {?> - - get_option('wpsg_mod_deliverytime_storetext')); ?> - get_option('wpsg_page_mod_deliverytime_storelink'))) { ?> -   - -
+
- -
- - - callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> - -
- - callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> - -
- -
-
- - - - - - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> -
- - view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> -
+ get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> + +
+ getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> +
+ + + +
+ getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> + + view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - - -
- callMod('wpsg_mod_productvariants', 'renderTemplate', array($this->view['data']['product_key'])); ?> -
-
-
- -
-
- view['oProduct']->canOrder()) { ?> -
+ + + + getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> + + + + +
+ view['data']['shortdesc']; ?> +
+ +
+ + + hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?> +
+ +
+ + + + + hasMod('wpsg_mod_fuellmenge')) { ?> + +
+ + '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], + ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', + wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) + ); ?> +
- hasMod('wpsg_mod_stock') || $this->callMod('wpsg_mod_stock', 'getBestand', array($this->view['data']['id']))) { ?> - - view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> - /> - - - get_option('wpsg_afterinsert'), array('2', '3'))) { ?> - - - -
- -
- -
- - -
- callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - callMods('productForSale', array($this->view['data']['product_key']))) { ?> - hasMod('wpsg_mod_stock') || $this->callMod('wpsg_mod_stock', 'getBestand', array($this->view['data']['id']))) { ?> - - - - - - - - - -
-
+
get_option('wpsg_mod_deliverytime_storetext')); ?>
-
+ get_option('wpsg_page_mod_deliverytime_storelink'))) { ?> +   + + + - hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> - - - -
+
+ + callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> +
-
+ callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> + +
+
+
+ -
- - + + + + +
view['data']['longdescription'])) > 0) { ?>
-
-

- view['data']['longdescription']; ?> +
+ view['data']['beschreibung']; ?>
- -
-
-

+ +
+ + + +
+ callMod('wpsg_mod_productvariants', 'renderTemplate', array($this->view['data']['product_key'])); ?> +
+ + +
+
+ view['oProduct']->canOrder()) { ?> +
+ + + + view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> /> + + + get_option('wpsg_afterinsert'), array('2', '3'))) { ?> + + +
-
+ +
+
+ +
-
-
-

+ hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> + + + + +
+ + view['data']['longdescription'])) > 0) { ?> +
+
+
+ view['data']['longdescription']; ?> +
- - -
+ + +
+
@@ -353,9 +288,9 @@
+ +
- callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
- -
\ No newline at end of file + callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> + +
\ No newline at end of file diff --git a/views/produkttemplates/standard2.phtml b/views/produkttemplates/standard2.phtml deleted file mode 100644 index c572f60..0000000 --- a/views/produkttemplates/standard2.phtml +++ /dev/null @@ -1,210 +0,0 @@ -view['data']['stock']); - - // Damit keine Zubehörprodukte ausgegeben werden - //$this->noReleatedProducts = true; - -?> - - - - -
-
- - - hasMod('wpsg_mod_produktbilder')) { ?> -
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])); - - ?> - 0) { ?> -
- - - - - - -
- -
- 1) { ?> - -
- - - -
- - -
- - - -
- - - -
- -

view['data']['name']); ?>

- - get_option('wpsg_showArticelnumber') == '1') { ?> -
- : view['data']['anr']); ?> -
- - -
- - - view['data']['preis']); ?> get_option('wpsg_currency'); ?> -
- - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - -
- - - - - hasMod('wpsg_mod_fuellmenge')) { ?> - -
- view['data']['fmenge'], $this->view['data']['feinheit'], true), - wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')), - wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) - ); ?> -
- - - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> -
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> -
- - - - -
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id'])); ?> -
- - -
- - - - - - - get_option('wpsg_afterinsert') == '2') { ?> - - - -
- -
- -
- - - callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?> - - -
- - view['data']['beschreibung'])) > 0) { ?> -
- -
- view['data']['beschreibung']; ?> -
- -
- - - callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
\ No newline at end of file diff --git a/views/produkttemplates/standard_1544.phtml b/views/produkttemplates/standard_1544.phtml deleted file mode 100644 index 62c92e4..0000000 --- a/views/produkttemplates/standard_1544.phtml +++ /dev/null @@ -1,435 +0,0 @@ -view['data']['stock']); - - // Damit keine Zubehörprodukte ausgegeben werden - //$this->noReleatedProducts = true; - -?> -
-
- -
- -

view['data']['name']); ?>

- - - hasMod('wpsg_mod_produktbilder')) { ?> -
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> - -
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?> - getTemplateIndex(); ?>" src="callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="" />*/?> -
- - - - - -
-
- - - - get_option('wpsg_showArticelnumber') == '1') { ?> -
- : view['data']['anr']); ?> -
- - -
- - - view['data']['preis']); ?> get_option('wpsg_currency'); ?>view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> -
- - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - -
- - - - - hasMod('wpsg_mod_fuellmenge')) { ?> - -
- view['data']['id'].'">'.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], - ''.wpsg_ff($this->view['data']['fmenge_preis']).' '. $this->get_option('wpsg_currency'), - wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) - ); ?> -
- - - - - - hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - -
- callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?> -
- - - - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> -
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> -
- - - - -
callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id'])); - - $arVarianten = @unserialize($this->view['data']['mod_varianten']); - - ?> - - - view['data']['vp_data']) && sizeof($this->view['data']['vp_data']) > 0) { ?> - view['data']['vp_data'] as $k => $var) { if ($var['aktiv'] == "1") { $vAktiv = true; ?> - -
- - - - - - - - - -
- - - - - - - $vari) { if ($vari['aktiv'] == "1" && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { $j ++; ?> - - - $vari) { if ($vari['aktiv'] == "1" && (!$this->hasMod('wpsg_mod_stock') || $vari['stock'] > 0)) { $j ++; ?> - $kv, 'j' => $j, 'name' => $variCode[1], 'vari' => $vari); - - } - else - { - - $arVariGroup[0][] = array('kv' => $kv, 'j' => $j, 'name' => $variCode[0], 'vari' => $vari); - - } - - ?> - - - $vg) { ?> -
- -
- -
- -
- - - -
-
- - - - - hasMod('wpsg_mod_stock') || $var['stock'] > 0)) { ?> - - - - -
- -
- -
- - - - - - -
- - -
- - - - - - get_option('wpsg_afterinsert') == '2') { ?> - - - -
- - - -
- - - callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?> - - -
- -
- - view['data']['beschreibung'])) > 0) { ?> -
- -
- view['data']['beschreibung']; ?> -
- -
- - - callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
\ No newline at end of file diff --git a/views/produkttemplates/standard_ajax.phtml b/views/produkttemplates/standard_ajax.phtml deleted file mode 100644 index 51f6065..0000000 --- a/views/produkttemplates/standard_ajax.phtml +++ /dev/null @@ -1,196 +0,0 @@ -view['data']); - - // Damit keine Zubehörprodukte ausgegeben werden - //$this->noReleatedProducts = true; - - //wpsg_debug($_SESSION); - -?> -
-
- -
- -

getProductName($this->view['data']['id']); ?>

- - - hasMod('wpsg_mod_produktbilder')) { ?> -
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> - view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?> -
- - <?php echo wpsg_hspc($this->view['data']['name']); ?> - -
- - - - - -
-
- - - - get_option('wpsg_showArticelnumber') == '1') { ?> -
- : view['data']['anr']); ?> -
- - -
- - - - view['data']['preis'], $this->get_option('wpsg_currency')); ?> - view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> - hasMod('wpsg_mod_discount') && $this->view['data']['preis_prediscount'] > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> - -
- - -
: view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> -
- - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - -
- - - - - hasMod('wpsg_mod_fuellmenge')) { ?> - -
- '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], - ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', - wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) - ); ?> -
- - - - - - hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - -
- callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?> -
- - - - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> -
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> -
- - - - -
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?> -
- - -
- - - - view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> - /> - - getTemplateIndex(); ?> - - -
- - view['oProduct']->canOrder()) { ?> - - - - hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> - - - -
- - - callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?> - - -
- -
- - view['data']['beschreibung'])) > 0) { ?> -
- -
- view['data']['beschreibung']; ?> -
- -
- - - callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
\ No newline at end of file diff --git a/views/produkttemplates/standard_alt.phtml b/views/produkttemplates/standard_alt.phtml deleted file mode 100644 index 3f419a5..0000000 --- a/views/produkttemplates/standard_alt.phtml +++ /dev/null @@ -1,327 +0,0 @@ -view['data']); - - // Damit keine Zubehörprodukte ausgegeben werden - //$this->noReleatedProducts = true; - - //wpsg_debug($_SESSION); - -if (!function_exists('is_plugin_active')) - require_once(ABSPATH.'/wp-admin/includes/plugin.php'); -?> -
- -
- - - - callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
- -
-
- - hasMod('wpsg_mod_produktbilder')) { ?> -
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> - view['data']['varianten_image']) || $b == $this->view['data']['varianten_image']) { ?> -
- - <?php echo wpsg_hspc($this->view['data']['name']); ?> - -
- - - - - -
-
- - -
-
- -
- -
-

getProductName($this->view['data']['id']); ?>

- callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> -
-
- get_option('wpsg_showArticelnumber') == '1') { ?> -
- : view['data']['anr']); ?>
- get_option('wpsg_mod_produktartikel_ean'))) {?> - :view['data']['ean']); ?>
- - get_option('wpsg_mod_produktartikel_gtin'))) {?> - :view['data']['gtin']); ?>
-
- - - - callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - -
- - - - view['data']['preis'], $this->get_option('wpsg_currency')); ?> - view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> - - hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> -
- : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> -
- -
- - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - -
- - - - - getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> - - - - - -
-

- view['data']['shortdesc']; ?> -
- -
- - hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?> -
- - -
- - - - - hasMod('wpsg_mod_fuellmenge')) { ?> - -
- - '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], - ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', - wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) - ); ?> -
- - - -
- -
- - hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - - - callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) {?> - - get_option('wpsg_mod_deliverytime_storetext')); ?> - get_option('wpsg_page_mod_deliverytime_storelink'))) { ?> -   - -
- - -
- - - callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> - -
- - callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> - -
- -
-
- - - - - - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> -
- - view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> -
- - - - -
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?> -
- -
- -
- -
-
- callMods('productForSale', array($this->view['data']['product_key'])) || ($this->hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id'])))) { ?> -
- - - - view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> - /> - - get_option('wpsg_afterinsert'), array('2', '3'))) { ?> - - - -
- -
- -
- - -
- callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - callMods('productForSale', array($this->view['data']['product_key']))) { ?> - - - - - - -
-
- -
- - hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> - - - -
- -
- -
- - -
- - view['data']['longdescription'])) > 0) { ?> -
-
-
-

- view['data']['longdescription']; ?> -
-
-
- - -
-
-

-
-
- -
-
-

-
-
- - -
- -
- - -
- - - -
- - callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
- -
\ No newline at end of file diff --git a/views/produkttemplates/standard_login.phtml b/views/produkttemplates/standard_login.phtml deleted file mode 100644 index 277adc7..0000000 --- a/views/produkttemplates/standard_login.phtml +++ /dev/null @@ -1,177 +0,0 @@ -view['data']['stock']); - - // Damit keine Zubehörprodukte ausgegeben werden - //$this->noReleatedProducts = true; - -?> -
-
- - - hasMod('wpsg_mod_produktbilder')) { ?> -
- callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])))) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder', array($this->view['data']['id'])) as $b) { $i ++; ?> - -
- callMod('wpsg_mod_produktbilder', 'genBild', array($this->view['data']['id'], $i, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'), 'pimage')); ?> - getTemplateIndex(); ?>" src="callMod('wpsg_mod_produktbilder', 'makeTn', array($this->view['data']['id'], $b, $this->get_option('wpsg_mod_produktbilder_width'), $this->get_option('wpsg_mod_produktbilder_height'), $this->get_option('wpsg_mod_produktbilder_mode'))); ?>" alt="" />*/?> -
- - - - - -
-
- - - -
- -

view['data']['name']); ?>

- -
- : view['data']['anr']); ?> -
- - - callMod('wpsg_mod_kundenverwaltung', 'getUserStatus', array($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn'))) == true) { ?> - - -
- - - view['data']['preis']); ?> get_option('wpsg_currency'); ?> -
- - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - -
- - - - - - - - - hasMod('wpsg_mod_fuellmenge')) { ?> - -
- view['data']['fmenge'], $this->view['data']['feinheit'], true), - wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')), - wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) - ); ?> -
- - - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> -
- view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> -
- - - - -
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['id'])); ?> -
- - - - callMod('wpsg_mod_kundenverwaltung', 'getUserStatus', array($this->callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn'))) == true) { ?> - - -
- - - - - - - get_option('wpsg_afterinsert') == '2') { ?> - - - -
- - - - - -
- -
- - - callMod('wpsg_mod_produktartikel', 'socialIntegration', array($this->view['data']['id'])); ?> - - -
- - view['data']['beschreibung'])) > 0) { ?> -
- -
- view['data']['beschreibung']; ?> -
- -
- - - callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
\ No newline at end of file diff --git a/views/produkttemplates/standard_mt.phtml b/views/produkttemplates/standard_mt.phtml deleted file mode 100644 index 632f7e3..0000000 --- a/views/produkttemplates/standard_mt.phtml +++ /dev/null @@ -1,341 +0,0 @@ -view['data']); - - // Damit keine Zubehörprodukte ausgegeben werden - //$this->noReleatedProducts = true; - - //wpsg_debug($_SESSION); - -if (!function_exists('is_plugin_active')) - require_once(ABSPATH.'/wp-admin/includes/plugin.php'); -?> -
- -
- - - - callMods('product_top', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
- -
-
- - hasMod('wpsg_mod_produktbilder')) { ?> -
- get_option('wpsg_mod_produktbilder_width'); - $pbh = $this->get_option('wpsg_mod_produktbilder_height'); - $pbm = $this->get_option('wpsg_mod_produktbilder_mode'); - $pbArr = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['data']['id'])); - ?> - - - view['data']['varianten_image']) || $b['basename'] == $this->view['data']['varianten_image']) { ?> -
- - - -
- - - - - -
-
- - -
-
- -
- -
-

getProductName($this->view['data']['id']); ?>

- callMods('product_top_afterheadline', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> -
-
- get_option('wpsg_showArticelnumber') == '1') { ?> -
- : view['data']['anr']); ?>
- get_option('wpsg_mod_produktartikel_ean'))) {?> - :view['data']['ean']); ?>
- - get_option('wpsg_mod_produktartikel_gtin'))) {?> - :view['data']['gtin']); ?>
-
- - - - callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - -
- - - - view['data']['preis'], $this->get_option('wpsg_currency')); ?> - view['data']['price_info'])) { echo '
'.wpsg_hspc($this->view['data']['price_info']).'
'; } ?> - - hasMod('wpsg_mod_discount') && wpsg_getInt($this->view['data']['preis_prediscount']) > 0 && wpsg_isSizedInt($this->get_option('wpsg_mod_discount_show'))) { ?> -
- : view['data']['preis_prediscount'], $this->get_option('wpsg_currency')); ?> -
- -
- - get_option('wpsg_kleinunternehmer')) { /* Kleinunternehmerregelung aktiviert START */ ?> - -
- getURL(wpsg_ShopController::URL_VERSANDKOSTEN).'">'.__('Versandkosten', 'wpsg').'', 'Endpreis'); ?> -
- - - -
- getFrontendTaxview() == WPSG_NETTO) { /* Frontend = NETTO Preise */ ?> - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - - view['data']['mwst_value']), ''.__('Versandkosten', 'wpsg').''); ?> - -
- - - - - getURL(wpsg_ShopController::URL_PROFIL).'">hier bitte ein, um zu bestellen.')); ?> - - - - - -
-

- view['data']['shortdesc']; ?> -
- -
- - hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showProduct') == '1') { ?> -
- - -
- - - - - hasMod('wpsg_mod_fuellmenge')) { ?> - -
- - '.wpsg_ff($this->view['data']['fmenge'], '', true).' '.$this->view['data']['feinheit'], - ''.wpsg_ff($this->view['data']['fmenge_preis'], $this->get_option('wpsg_currency')).' ', - wpsg_ff($this->get_option('wpsg_mod_fuellmenge_bezug'), $this->view['data']['feinheit']) - ); ?> -
- - - -
- -
- - hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_show_product') == '1') { ?> - - - callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($this->view['data']['product_key']))) {?> - - get_option('wpsg_mod_deliverytime_storetext')); ?> - get_option('wpsg_page_mod_deliverytime_storelink'))) { ?> -   - -
- - -
- - - callMod('wpsg_mod_deliverytime', 'displayDeliveryTime', array($this->view['data']['product_key'])); ?> - -
- - callMod('wpsg_mod_deliverytime', 'displayDelayTime', array($this->view['data']['product_key'])); ?> - -
- -
-
- - - - - - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProduct') === '1') { ?> -
- - view['data']['id'].'">'.wpsg_ff($this->view['data']['weight']).'', $this->get_option('wpsg_mod_weight_unit')); ?> -
- - - - -
- callMod('wpsg_mod_varianten', 'renderTemplate', array($this->view['data']['product_key'])); ?> -
- -
- -
- -
-
- view['oProduct']->canOrder()) { ?> -
- - - - view['data']['basket_multiple'] == 4)?' readonly="readonly" ':''); ?> - /> - - get_option('wpsg_afterinsert'), array('2', '3'))) { ?> - - - -
- -
- -
- - -
- callMod('wpsg_mod_kundenverwaltung', 'isLoggedIn') && ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '1')) || ($this->get_option('wpsg_mod_kundenverwaltung_preisAnzeige') == '0')) { ?> - callMods('productForSale', array($this->view['data']['product_key']))) { ?> - - - - - - -
-
- -
- - hasMod('wpsg_mod_request') && $this->callMod('wpsg_mod_request', 'isRequestProduct', array($this->view['data']['id']))) { ?> - - - -
- -
- -
- - -
- - view['data']['longdescription'])) > 0) { ?> -
-
-
-

- view['data']['longdescription']; ?> -
-
-
- - -
-
-

-
-
- -
-
-

-
-
- - -
- -
- - -
- - - -
- - callMods('product_bottom', array(&$this->view['data']['id'], $this->getTemplateIndex())); ?> - -
- -
\ No newline at end of file diff --git a/views/warenkorb/ajaxDialog.phtml b/views/warenkorb/ajaxDialog.phtml index d029faf..4ac5c4f 100644 --- a/views/warenkorb/ajaxDialog.phtml +++ b/views/warenkorb/ajaxDialog.phtml @@ -4,151 +4,98 @@ * Template für den Dialog wenn im Backend "Lightbox Meldung" eingestellt ist */ - // $this->view['error'] // Steht auf true wenn ein Fehler produziert und angezeigt werden soll // $this->view['product_key'] // Der ProduktSchlüssel des hinzugefügten Produktes // $this->view['amount_add'] // So oft wurde das Produkt hinzugefügt // $this->view['amount_basket'] // So oft befindet sich das hinzugefügte Produkt im Warenkorb // $this->view['product_data'] // Array mit Produktdaten // $this->view['product_index'] // Index des Produktes im Warenkorb -?>
- -
- - view['error'] === true) { ?> + $arImages = $this->callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->view['product_data']['product_id'])); + if (!wpsg_isSizedArray($arImages)) $arImages = array(); -

+ $arBasket = $this->basket->toArray(); - writeFrontendMessage(); ?> - -
- -
- -
- - - -
- hasMod('wpsg_mod_produktbilder')) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($this->view['product_data']['id']))); ?> - - - - - - -
- -
- view['error'] === true) { echo $this->writeFrontendMessage(); } else { ?> - - - view['amount_add'], - $this->getProductName($this->view['product_data']['id'], true)); ?> - - -
- - -
- - view['product_data']['preis'], $this->get_option('wpsg_currency')); ?> -
-
- +?> + +
+ +
+ +
+ + +
+ + +
+ view['product_data']['preis'], $this->get_option('wpsg_currency')) + ); ?> +
+ get_option('wpsg_currency')) + ); ?> +
+
+ + + + hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog') === '1') { ?> +
+ '.wpsg_ff($this->view['product_data']['fmenge']).'', $this->view['product_data']['feinheit']); ?> +
+ +
+ + + + hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showAjaxDialog') === '1') { ?> +
+ '.wpsg_ff($this->view['product_data']['weight']).'', $this->view['product_data']['weight_unit']); ?> +
+ +
+ + +
+ +
+ + + hasMod('wpsg_mod_relatedproducts') && $this->get_option('wpsg_mod_relatedproducts_showAjaxDialog') === '1') { ?> + callMod('wpsg_mod_relatedproducts', 'getRelatedProducts', array($this->getProduktID($this->view['product_key']))); ?> + +
+

- - hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showAjaxDialog') === '1') { ?> -
- '.wpsg_ff($this->view['product_data']['fmenge']).'', $this->view['product_data']['feinheit']); ?> -
- -
- - - - hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showAjaxDialog') === '1') { ?> -
- '.wpsg_ff($this->view['product_data']['weight']).'', $this->view['product_data']['weight_unit']); ?> -
-
- -
- -
- - - hasMod('wpsg_mod_relatedproducts') && $this->get_option('wpsg_mod_relatedproducts_showAjaxDialog') === '1') { ?> - callMod('wpsg_mod_relatedproducts', 'getRelatedProducts', array($this->getProduktID($this->view['product_key']))); ?> - -
-

- -
- - loadProduktArray($rp_data['product_id']); ?> - -
-

getProductName($rp_data['product_id']); ?>

- - hasMod('wpsg_mod_produktbilder')) { ?> - callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($this->view['product_data']['id']))); ?> - - - - - - - -
- + loadProduktArray($rp_data['product_id']); ?> + +
+

getProductName($rp_data['product_id']); ?>

+ + hasMod('wpsg_mod_produktbilder')) { ?> + callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($this->getProduktId($this->view['product_data']['id']))); ?> + + + + -
- - - -
- - -
- - -
-
- - - - clearFrontendMessage(); ?> - -
- -
- - \ No newline at end of file + \ No newline at end of file diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index f004133..d61fb57 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -35,6 +35,56 @@
+
+ + view['basket']['produkte'] as $k => $product_data) { ?> +
+ + callMod('wpsg_mod_produktbilder', 'getProduktBilder_MT', array($product_data['product_id'])); if (!wpsg_isSizedArray($arImages)) $arImages = array(); ?> + +
+ + + +
+ + +
+ +
+ getProduktLink($product_data)) { ?> + + + + + + +
+ + +
+ +
+
+ + value="" size="3" /> + +
+
+ get_option('wpsg_currency')); ?> +
+
+ get_option('wpsg_currency')); ?> +
+
+ +
+ +
+ +
+ + diff --git a/views/warenkorb/messageDialog.phtml b/views/warenkorb/messageDialog.phtml index 96ca5c1..1a2ee6b 100644 --- a/views/warenkorb/messageDialog.phtml +++ b/views/warenkorb/messageDialog.phtml @@ -7,27 +7,27 @@ ?> -
-
-
- writeFrontendMessage(); $this->clearFrontendMessage(); ?> -
- -
-
-
+
+ +
+ writeFrontendMessage(); $this->clearFrontendMessage(); ?> + view['content']); ?> +
+ +
+ + \ No newline at end of file + + /* ]]> */ + +
\ No newline at end of file -- cgit v1.2.3