Index: /controller/wpsg_ProduktController.class.php =================================================================== --- /controller/wpsg_ProduktController.class.php (revision 5450) +++ /controller/wpsg_ProduktController.class.php (revision 5451) @@ -404,5 +404,5 @@ // VerfÌgbare Produkttemplates $this->shop->view['templates'] = $this->shop->loadProduktTemplates(); - + if (isset($_REQUEST['wpsg_lang'])) { @@ -469,5 +469,5 @@ } - + // Produktobject $this->shop->view['oProduct'] = wpsg_product::getInstance($_REQUEST['edit_id']); @@ -480,5 +480,5 @@ $this->shop->callMods('produkt_edit', array(&$this->shop->view['data'])); - + // SteuersÀtze des Standardlandes ermitteln $this->shop->view['arTaxGroup'] = array( @@ -520,5 +520,5 @@ } - + $this->shop->view['arSubAction'] = array( 'general' => array( @@ -527,5 +527,5 @@ ) ); - + $this->shop->view['arSubAction']['texte'] = array( 'title' => __('Texte', 'wpsg'), @@ -540,5 +540,5 @@ 'content' => $this->shop->render(WPSG_PATH_VIEW.'/produkt/addedit_price.phtml', false) ); - + $this->shop->view['arSubAction']['payship'] = array( 'title' => __('Versand-/ Zahlungsarten', 'wpsg'), @@ -620,4 +620,5 @@ 'name' => wpsg_q($_REQUEST['name']), 'detailname' => wpsg_q($_REQUEST['detailname']), + 'shortdesc' => wpsg_q($_REQUEST['shortdesc']), 'beschreibung' => wpsg_q($_REQUEST['beschreibung']) ); @@ -641,4 +642,5 @@ 'name' => wpsg_q(wpsg_getStr($_REQUEST['name'])), 'detailname' => wpsg_q(wpsg_getStr($_REQUEST['detailname'])), + 'shortdesc' => wpsg_q(wpsg_getStr($_REQUEST['shortdesc'])), 'beschreibung' => wpsg_q(wpsg_getStr($_REQUEST['beschreibung'])), 'anr' => wpsg_q(wpsg_getStr($_REQUEST['anr'])), @@ -729,9 +731,22 @@ $this->shop->view['templates'] = $this->shop->loadProduktTemplates(); - $this->shop->view['data'] = array( - 'id' => false + $this->shop->view['data'] = array( + 'id' => false, + 'ptemplate_file' => 'standard.phtml' ); - $this->shop->callMods('produkt_add', array(&$this->shop->view['data'])); + $this->shop->view['arSubAction'] = array( + 'general' => array( + 'title' => __('Allgemein', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/produkt/addedit_general.phtml', false) + ) + ); + + $this->shop->view['arSubAction']['texte'] = array( + 'title' => __('Texte', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/produkt/addedit_texte.phtml', false) + ); + + $this->shop->callMods('product_addedit_content', array(&$this->shop->view['arSubAction'], &$this->shop->view['data'])); $this->shop->render(WPSG_PATH_VIEW.'/produkt/addedit.phtml'); Index: /lib/helper_functions.inc.php =================================================================== --- /lib/helper_functions.inc.php (revision 5450) +++ /lib/helper_functions.inc.php (revision 5451) @@ -426,5 +426,5 @@ { - $TC = new wpsg_ShopController(); + $TC = new wpsg_SystemController(); $TC->view['field_name'] = $field_name; @@ -583,30 +583,28 @@ } // function wpsg_drawForm_Checkbox($field_name, $field_label, $conf = array()) - function wpsg_drawForm_AdminboxStart() + function wpsg_drawForm_AdminboxStart($title) + { + + echo '
'; + echo '
'; + echo '

'.$title.'

'; + echo '
'; + echo '
'; + + } + + function wpsg_drawForm_AdminboxEnd() + { + + echo '
'; + echo '
'; + + } + + function wpsg_drawForm_TextStart() { ob_start(); - } - - function wpsg_drawForm_AdminboxEnd($title) - { - - $TC = new wpsg_ShopController(); - - $TC->view['title'] = $title; - $TC->view['content'] = ob_get_contents(); - - ob_end_clean(); - - return $TC->render(WPSG_PATH_VIEW.'admin/form/adminbox.phtml', false); - - } - - function wpsg_drawForm_TextStart() - { - - ob_start(); - } // function wpsg_drawForm_TextStart() @@ -614,5 +612,5 @@ { - $TC = new wpsg_ShopController(); + $TC = new wpsg_SystemController(); $TC->view['field_label'] = $field_label; @@ -629,5 +627,5 @@ { - $TC = new wpsg_ShopController(); + $TC = new wpsg_SystemController(); $TC->view['field_label'] = $field_label; @@ -642,5 +640,5 @@ { - $TC = new wpsg_ShopController(); + $TC = new wpsg_SystemController(); $TC->view['field_label'] = $field_label; @@ -653,5 +651,5 @@ { - $TC = new wpsg_ShopController(); + $TC = new wpsg_SystemController(); $TC->view['field_name'] = $field_name; @@ -912,5 +910,5 @@ { - $TC = new wpsg_ShopController(); + $TC = new wpsg_SystemController(); $TC->view['field_name'] = $field_name; Index: /lib/install.php =================================================================== --- /lib/install.php (revision 5450) +++ /lib/install.php (revision 5451) @@ -30,4 +30,5 @@ name VARCHAR(255) NOT NULL, detailname VARCHAR(500) NOT NULL, + shortdesc VARCHAR(1500) NOT NULL, anr VARCHAR(100) NOT NULL, typ VARCHAR(100) NOT NULL, Index: /mods/wpsg_mod_basic.class.php =================================================================== --- /mods/wpsg_mod_basic.class.php (revision 5450) +++ /mods/wpsg_mod_basic.class.php (revision 5451) @@ -230,5 +230,6 @@ public function produkt_index_aftersearch() { } - /** Wird beim bearbeiten eines Produktes aufgerufen, hier kann der Array modifiziert werden, der an das view ÃŒbergeben wird */ + /** DEPRECATED:Soll durch product_addedit_content ersetzt werden + * Wird beim bearbeiten eines Produktes aufgerufen, hier kann der Array modifiziert werden, der an das view ÃŒbergeben wird */ public function produkt_edit(&$produkt_data) { } @@ -236,5 +237,6 @@ public function produkt_copy(&$produkt_id, &$copy_id) { } - /** Wird beim anlegen eines neuen Produktes aufgerufen */ + /** DEPRECATED und INACTIV:Soll durch product_addedit_content ersetzt werden + * Wird beim anlegen eines neuen Produktes aufgerufen */ public function produkt_add(&$produkt_data) { } @@ -254,7 +256,4 @@ * */ public function produkt_edit_sidebar(&$produkt_data) { } - - /** Wird in der Postbox Allgmeine beim Bearbeiten eines Produktes aufgerufen */ - public function produkt_edit_allgemein(&$produkt_data) { } /** @@ -265,4 +264,7 @@ public function produkt_edit_content(&$produkt_data) { } + /** Wird in der Postbox Allgmeine beim Bearbeiten eines Produktes aufgerufen */ + public function produkt_edit_allgemein(&$produkt_data) { } + /** * Integration von Modulen in die Produktverwaltung Index: /mods/wpsg_mod_fuellmenge.class.php =================================================================== --- /mods/wpsg_mod_fuellmenge.class.php (revision 5450) +++ /mods/wpsg_mod_fuellmenge.class.php (revision 5451) @@ -68,27 +68,25 @@ } // public function settings_save() - public function produkt_add(&$data) + public function product_addedit_content(&$product_content, &$product_data) { - $data['arFeinheiten'] = explode(',', $this->shop->get_option('wpsg_mod_fuellmenge_einheit')); + if (wpsg_isSizedInt($product_data['id'])) + { + + $product_data = wpsg_array_merge($product_data, $this->db->fetchRow(" + SELECT + `feinheit`, `fmenge` + FROM + `".WPSG_TBL_PRODUCTS."` + WHERE + `id` = '".wpsg_q($product_data['id'])."' + ")); + + } - } // public function produkt_add(&$data) - - public function produkt_edit(&$data) - { + $product_data['arFeinheiten'] = explode(',', $this->shop->get_option('wpsg_mod_fuellmenge_einheit')); - $data = wpsg_array_merge($data, $this->db->fetchRow(" - SELECT - `feinheit`, `fmenge` - FROM - `".WPSG_TBL_PRODUCTS."` - WHERE - `id` = '".wpsg_q($data['id'])."' - ")); - - $data['arFeinheiten'] = explode(',', $this->shop->get_option('wpsg_mod_fuellmenge_einheit')); - - } // public function produkt_edit(&$data) - + } // public function product_addedit_content(&$product_content, &$product_data) + public function produkt_save(&$produkt_id) { Index: /mods/wpsg_mod_produktartikel.class.php =================================================================== --- /mods/wpsg_mod_produktartikel.class.php (revision 5450) +++ /mods/wpsg_mod_produktartikel.class.php (revision 5451) @@ -292,25 +292,5 @@ } // public function produkt_copy(&$produkt_id, &$copy_id) - - public function produkt_edit(&$data) - { - - global $wpdb; - - $data = wpsg_array_merge($data, (array)$this->db->fetchRow(" - SELECT - `id` AS `post_id`, - `comment_status`, - `menu_order`, - `post_name` - FROM - `".$this->shop->prefix."posts` - WHERE - `wpsg_produkt_id` = '".wpsg_q($data['id'])."' AND - `post_type` = '".wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey'))."' - ")); - - } // public function produkt_edit(&$data) - + public function produkt_del($produkt_id) { @@ -376,15 +356,6 @@ } // public function wp_head() - public function produkt_edit_sidebar(&$produkt_data) - { - - if (isset($_REQUEST['wpsg_lang'])) return; - - $this->shop->view['data'] = $produkt_data; - $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktartikel/produkt_edit_sidebar.phtml'); - - } // public function produkt_edit_sidebar(&$produkt_data) - - public function produkt_edit_allgemein(&$produkt_data) { + public function produkt_edit_allgemein(&$produkt_data) + { $this->shop->view['data'] = $produkt_data; @@ -392,5 +363,38 @@ } // public function produkt_edit_allgemein(&$produkt_data) - + + public function product_addedit_content(&$product_content, &$product_data) + { + + global $wpdb; + + // Bei Übersetzungen nichts machen + if (isset($_REQUEST['wpsg_lang'])) return; + + if (wpsg_isSizedInt($product_data['id'])) + { + + $product_data = wpsg_array_merge($product_data, (array)$this->db->fetchRow(" + SELECT + `id` AS `post_id`, + `comment_status`, + `menu_order`, + `post_name` + FROM + `".$this->shop->prefix."posts` + WHERE + `wpsg_produkt_id` = '".wpsg_q($product_data['id'])."' AND + `post_type` = '".wpsg_q($this->shop->get_option('wpsg_mod_produktartikel_pathkey'))."' + ")); + + } + + $product_content['wpsg_mod_produktartikel'] = array( + 'title' => __('Kategorie / Artikel', 'wpsg'), + 'content' => $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_produktartikel/produkt_addedit_content.phtml', false) + ); + + } // public function product_addedit_content(&$product_content, &$product_data) + public function produkt_save_translation(&$produkt_id, &$trans_id) { Index: /mods/wpsg_mod_topseller.class.php =================================================================== --- /mods/wpsg_mod_topseller.class.php (revision 5450) +++ /mods/wpsg_mod_topseller.class.php (revision 5451) @@ -68,5 +68,5 @@ if (isset($_REQUEST['wpsg_lang'])) return; - $this->shop->view['wpsg_mod_topseller']['status'] = $produkt_data['wpsg_mod_topseller']; + $this->shop->view['wpsg_mod_topseller']['status'] = wpsg_getStr($produkt_data['wpsg_mod_topseller']); $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_topseller/produkt_edit_allgemein.phtml'); Index: ews/admin/form/adminbox.phtml =================================================================== --- /views/admin/form/adminbox.phtml (revision 5450) +++ (revision ) @@ -1,6 +1,0 @@ -
-
-

view['title']; ?>

-
-
view['content']; ?>
-
Index: /views/admin/module.phtml =================================================================== --- /views/admin/module.phtml (revision 5450) +++ /views/admin/module.phtml (revision 5451) @@ -51,27 +51,20 @@ arAllModule[$_REQUEST['modul']]->version)) { ?> arAllModule[$_REQUEST['modul']]->version, array('text' => true)); ?> -
-
- : -
-
-

- arAllModule[$_REQUEST['modul']]->free) && $this->arAllModule[$_REQUEST['modul']]->free === true) { ?> - - - arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) { ?> - - - arAllModule[$_REQUEST['modul']]->getDemoDays() > 0) { ?> - arAllModule[$_REQUEST['modul']]->getDemoDays()); ?> - - - - - -

-
-
-
+ + arAllModule[$_REQUEST['modul']]->free) && $this->arAllModule[$_REQUEST['modul']]->free === true) { ?> + + + arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) { ?> + + + arAllModule[$_REQUEST['modul']]->getDemoDays() > 0) { ?> + arAllModule[$_REQUEST['modul']]->getDemoDays()); ?> + + + + + + + Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5450) +++ /views/css/admin.css (revision 5451) @@ -26,4 +26,7 @@ #wpsg-bs .form-select .form-control { padding-left:5px; } #wpsg-bs .form-group-sm .form-control-static { padding-left:10px; height:auto; } +#wpsg-bs .list-group-head { background-color:#666666; color:#FFFFFF; border:1px solid #666666; } +#wpsg-bs .wpsg_admin_submenu .list-group-item.active { color:#FFFFFF; } +#wpsg-bs .list-group-head a { color:#FFFFFF; } /* Inline Edit */ @@ -81,5 +84,4 @@ .wpsg_admin_content h3.panel-title { margin-bottom:0px; } .wpsg_admin_submenu .list-group-item { padding:5px 10px; } -.wpsg_admin .list-group-head { background-color:#666666; color:#FFFFFF; border:1px solid #666666; } .list-group { margin-bottom:15px !important; } @@ -102,5 +104,5 @@ .form-checkbox label { font-size:12px; line-height:200%; } -/* Produktbilder */ +/* Modul Produktbilder (wpsg_mod_produktbilder) */ #produktbilder_target img { } .wpsg_mod_produktbilder_admin_bild a { position:relative; display:inline-block; float:left; margin-right:5px; margin-bottom:5px; } @@ -108,2 +110,7 @@ .wpsg_mod_produktbilder_admin_bild a > span > span { font-size:30px; top:50%; margin-top:-15px; } .wpsg_mod_produktbilder_admin_bild a:hover > span { display:block; } + +/* Modul Produktartikel (wpsg_mod_produktartikel) */ +.wpsg-mod_produktartikel_categorydiv .tabs-panel { padding-top:8px !important; } +.wpsg-mod_produktartikel_categorydiv label { font-weight:normal; font-size:14px; } +.wpsg-mod_produktartikel_categorydiv label input[type="checkbox"] { margin-top:-2px; } Index: /views/css/frontend.css =================================================================== --- /views/css/frontend.css (revision 5450) +++ /views/css/frontend.css (revision 5451) @@ -331,16 +331,20 @@ .wpsg_productview_pager .wpsg_productview_pager_wrap > span, .wpsg_productview_pager .wpsg_productview_pager_wrap > a { display:inline-block; width:30px; height:30px; line-height:30px; color:#0F303F; border:1px solid #0F303F; margin-left:15px; margin-right:15px; } -.wpsg_productview_product { padding-top:15px; padding-bottom:15px; position:relative; margin-bottom:25px; } -.wpsg_productview_product .wpsg_mod_productview_bottom { position:relative; display:table; width:100%; } -.wpsg_productview_product .wpsg_mod_productview_name { display:table-cell; } -.wpsg_productview_product .wpsg_mod_productview_name h2 { font-size:12px; color:#0F2F3E; font-weight:bold; margin-top:15px; } -.wpsg_productview_product .wpsg_mod_productview_price_wrap { font-weight:bold; font-size:12px; display:table-cell; text-align:right; color:#0F2F3E; white-space:nowrap; } -.wpsg_productview_product .wpsg_mod_productview_price_wrap .wpsg_mod_productview_oldprice { text-decoration: line-through; } -.wpsg_productview_product .wpsg_mod_productview_price_wrap .wpsg_mod_productview_pricehiglight { color:#FF0000; } -.wpsg_productview_product .wpsg_mod_productview_go { display:none; position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.25); text-align:center; } -.wpsg_productview_product .wpsg_mod_productview_go > .wpsg_star_wrap { font-size:22px; color:#0F303F; width:80%; position:absolute; left:50%; margin-left:-40%; top:10%; } +.wpsg_productview_product { padding-top:15px; padding-bottom:40px; position:relative; margin-bottom:25px; } +.wpsg_productview_product .wpsg_mod_productview_bottom { display:block; width:100%; text-align:center; } +.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_name h2 { font-size:14px; font-weight:bold; margin-bottom:5px; } +.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_description { color:#436980; line-height:20px; font-size:14px; margin-bottom:5px; } +.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_button { left:50%; margin-left:-90px; width:180px; position:absolute; bottom:0px; white-space:nowrap; padding:5px 25px 5px 25px; border:1px solid #A6DAE8; font-weight:bold; text-transform:uppercase; color:#29556E; } +.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_button:hover { text-decoration:none; background-color:#29556E; color:#FFFFFF; } +.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_button .fa { margin-left:10px; } +.wpsg_productview_product .wpsg_mod_productview_go { display:none; position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(228, 243, 248, 1); mix-blend-mode:multiply; text-align:center; } +.wpsg_productview_product .wpsg_mod_productview_go > .wpsg_star_wrap { font-size:22px; color:#0F303F; width:80%; position:absolute; left:50%; margin-left:-40%; top:10%; font-size:18px; font-weight:normal; } +.wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_price_wrap { color:#0F303F; width:100%; position:absolute; left:50%; margin-left:-50%; top:30%; font-size:20px; line-height:125%; font-weight:bold; } +.wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_price_wrap .wpsg_mod_productview_oldprice { text-decoration:line-through; } +.wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_price_wrap .wpsg_mod_productview_current { color:red; } +.wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_tax_wrap { color:#565656; width:100%; position:absolute; left:50%; margin-left:-50%; top:60%; font-size:14px; line-height:125%; } .wpsg_productview_product:hover { text-decoration:none; } .wpsg_productview_product:hover .wpsg_mod_productview_go { display:block; } -.wpsg_mod_productview_loading { width:100%; height:100%; background-color:rgba(255, 255, 255, 0.5); position:absolute; left:0px; top:0px; } +.wpsg_mod_productview_loading { width:100%; height:100%; background-color:rgba(249, 252, 253, 0.75); position:absolute; left:0px; top:0px; } Index: /views/mods/mod_productview/productview.js =================================================================== --- /views/mods/mod_productview/productview.js (revision 5450) +++ /views/mods/mod_productview/productview.js (revision 5451) @@ -20,4 +20,5 @@ jQuery('#wpsg_productview_' + index).replaceWith(data); + wpsg_correctProductview(index); } @@ -28,2 +29,21 @@ } + function wpsg_correctProductview(index) + { + + var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_name').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height); + var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_description').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height); + + } + + jQuery(document).ready(function() { + + jQuery('.wpsg_productview').each(function() { + + var x = jQuery(this).attr("id").substr(17); + wpsg_correctProductview(x); + + } ); + + } ); + Index: /views/mods/mod_productview/productview.phtml =================================================================== --- /views/mods/mod_productview/productview.phtml (revision 5450) +++ /views/mods/mod_productview/productview.phtml (revision 5451) @@ -36,5 +36,5 @@ view['wpsg_mod_productview']['products'] as $oProduct) { $i ++; ?> - getProductName())); ?>" href="getProductURL(); ?>" class="wpsg_productview_product wpsg_productview_product_id; ?> col-lg-3"> +
hasMod('wpsg_mod_produktbilder')) { ?> @@ -48,19 +48,31 @@
- +
-
getPrice(), $this->get_option('wpsg_currency')); ?>
+ +
+ 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) { ?> - - +
+ 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)); ?> + +
- + + @@ -71,24 +83,15 @@ -
- - getOldPrice(); ?> - -
get_option('wpsg_currency')); ?>
- - - getMinPrice() != $oProduct->getPrice()) { ?> -
getMinPrice(), $this->get_option('wpsg_currency'))); ?>
- -
getPrice(), $this->get_option('wpsg_currency')); ?>
- - +
+ shortdesc; ?>
+ +
- + @@ -99,5 +102,5 @@ - +
@@ -126,3 +129,3 @@ - + Index: /views/mods/mod_produktartikel/produkt_addedit_content.phtml =================================================================== --- /views/mods/mod_produktartikel/produkt_addedit_content.phtml (revision 5451) +++ /views/mods/mod_produktartikel/produkt_addedit_content.phtml (revision 5451) @@ -0,0 +1,31 @@ + + + + +
+ +
+ +
+
+ + + + + + view['data']['menu_order'])); ?> + view['data']['comment_status'])); ?> + +
+ + + + Index: /views/mods/mod_produktartikel/produkt_edit_allgemein.phtml =================================================================== --- /views/mods/mod_produktartikel/produkt_edit_allgemein.phtml (revision 5450) +++ /views/mods/mod_produktartikel/produkt_edit_allgemein.phtml (revision 5451) @@ -7,13 +7,3 @@ ?> -
-
- -
-
- -
-
-
+view['data']['post_name'])); ?> Index: ews/mods/mod_produktartikel/produkt_edit_sidebar.phtml =================================================================== --- /views/mods/mod_produktartikel/produkt_edit_sidebar.phtml (revision 5450) +++ (revision ) @@ -1,33 +1,0 @@ - -
-

-
- -

-
- view['data']['menu_order']); ?> - view['data']['comment_status']); ?> -
-
- -
-

-

-
-
- -
-
    - view['data']['post_id'], array('taxonomy' => 'category')); ?> -
-
- -
-
-
Index: /views/mods/mod_produktartikel/settings_edit.phtml =================================================================== --- /views/mods/mod_produktartikel/settings_edit.phtml (revision 5450) +++ /views/mods/mod_produktartikel/settings_edit.phtml (revision 5451) @@ -6,13 +6,5 @@ ?> -
-
:
-
- - -
-
-
- +get_option('wpsg_mod_produktartikel_pathkey'), array('help' => 'mod_produktartikel_pathkey')); ?> get_option('wpsg_mod_produktartikel_showui'), array('help' => 'wpsg_mod_produktartikel_showui'))?> @@ -27,62 +19,22 @@ get_option('wpsg_mod_produktartikel_onlyMainQuery'), array('help' => 'wpsg_mod_produktartikel_onlyMainQuery')); ?> -
-
- -
-
- view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?> -

- - - - -
-
-
-
-
- -
-
- view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?> -

- - - - -
-
-
-
-
- -
-
- view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?> -

- - - - -
-
-
+view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?> + 'wpsg_error')); ?> + + __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_hometemplate')), array('help' => 'mod_produktartikel_hometemplate', 'noKeys' => true)); ?> + +view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?> + 'wpsg_error')); ?> + + __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_listtemplate')), array('help' => 'mod_produktartikel_listtemplate', 'noKeys' => true)); ?> + + +view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?> + 'wpsg_error')); ?> + + __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_searchtemplate')), array('help' => 'mod_produktartikel_searchtemplate', 'noKeys' => true)); ?> + + get_option('wpsg_mod_produktartikel_facebook'), array('help' => 'wpsg_mod_produktartikel_facebook')); ?> get_option('wpsg_mod_produktartikel_google'), array('help' => 'wpsg_mod_produktartikel_google')); ?> Index: /views/mods/mod_produktbilder/produkt_addedit_content.phtml =================================================================== --- /views/mods/mod_produktbilder/produkt_addedit_content.phtml (revision 5450) +++ /views/mods/mod_produktbilder/produkt_addedit_content.phtml (revision 5451) @@ -143,6 +143,9 @@

+ view['data']['id'])) { ?>
-
+
+ + Index: /views/produkt/addedit.phtml =================================================================== --- /views/produkt/addedit.phtml (revision 5450) +++ /views/produkt/addedit.phtml (revision 5451) @@ -31,4 +31,11 @@
+ + view['data']['id'])) { ?> + ', 'wpsg'), $this->view['data']['id'], $this->view['oProduct']->getProductURL()); ?> + + + + view['arSubAction'] as $k => $v) { $i ++; ?> @@ -69,5 +76,5 @@ jQuery(document).ready(function() { - jQuery('#wpsg_product_tabs a').bind('click', function() { + jQuery('#wpsg_product_tabs a.list-group-item').bind('click', function() { jQuery('#wpsg_product_tabs a').removeClass('active'); Index: /views/produkt/addedit_general.phtml =================================================================== --- /views/produkt/addedit_general.phtml (revision 5450) +++ /views/produkt/addedit_general.phtml (revision 5451) @@ -7,6 +7,6 @@ ?> - - view['data']['name'], array('placeholder' => __('Bitte hier den Produktnamen eingeben', 'wpsg'))); ?> + + view['data']['name']), array('placeholder' => __('Bitte hier den Produktnamen eingeben', 'wpsg'))); ?> isMultiLingual()) { ?> @@ -25,4 +25,5 @@ view['data']['detailname'])); ?> + view['data']['shortdesc'])); ?> view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?> view['data']['id']), array('readonly' => true)); ?> @@ -53,11 +54,11 @@ callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> - + - + view['data']['posturl']), array('help' => 'URLBenachrichtigung')); ?> view['data']['posturl_verkauf'])); ?> view['data']['posturl_bezahlung'])); ?> - + Index: /views/produkt/addedit_payship.phtml =================================================================== --- /views/produkt/addedit_payship.phtml (revision 5450) +++ /views/produkt/addedit_payship.phtml (revision 5451) @@ -6,5 +6,5 @@ ?> - + __('Alle', 'wpsg'), '1' => __('Auswahl', 'wpsg')), ((wpsg_isSizedArray($this->view['allowedPayment']))?'1':'0')); ?>
@@ -29,7 +29,7 @@ /* ]]> */ - + - + __('Alle', 'wpsg'), '1' => __('Auswahl', 'wpsg')), ((wpsg_isSizedArray($this->view['allowedShipping']))?'1':'0')); ?>
@@ -54,3 +54,3 @@ /* ]]> */ - + Index: /views/produkt/addedit_price.phtml =================================================================== --- /views/produkt/addedit_price.phtml (revision 5450) +++ /views/produkt/addedit_price.phtml (revision 5451) @@ -1,3 +1,3 @@ - + view['data']['mwst_key']); ?> getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['preis'])); ?> @@ -6,4 +6,4 @@ view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?> - + Index: /views/produkt/addedit_texte.phtml =================================================================== --- /views/produkt/addedit_texte.phtml (revision 5450) +++ /views/produkt/addedit_texte.phtml (revision 5451) @@ -7,5 +7,5 @@ ?> - + - + Index: /views/produkt/index.phtml =================================================================== --- /views/produkt/index.phtml (revision 5450) +++ /views/produkt/index.phtml (revision 5451) @@ -218,5 +218,5 @@
- hasMod('wpsg_mod_varianten') && wpsg_isSizedArray($this->callMod('wpsg_mod_varianten', 'loadVarianten', array($d['id'])))) { ?> + hasMod('wpsg_mod_varianten')) $arVarianten = $this->callMod('wpsg_mod_varianten', 'loadVarianten', array($d['id'])); if (wpsg_isSizedArray($arVarianten)) { ?>