From 5014b2d0fecd276ef3bf0c5eb378128a6c88cc6f Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 2 Aug 2018 08:26:29 +0000 Subject: git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7086 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/presentation.phtml | 6 +- views/css/admin.css | 28 +++ views/produkt/addedit_general.phtml | 163 ++++++++------- views/produkt/addedit_templateV3.phtml | 362 +++++++++++++++++++++++++++++++++ 4 files changed, 483 insertions(+), 76 deletions(-) create mode 100644 views/produkt/addedit_templateV3.phtml diff --git a/views/admin/presentation.phtml b/views/admin/presentation.phtml index 5081683..859ce0c 100644 --- a/views/admin/presentation.phtml +++ b/views/admin/presentation.phtml @@ -39,7 +39,11 @@ get_option('wpsg_showMwstAlways')); ?> get_option('wpsg_showArticelnumber')); ?> get_option('wpsg_hideBasketCountrySelect')); ?> - + +
+ + get_option('wpsg_v3DesignMode'), array('help' => 'wpsg_v3DesignMode')); ?> + diff --git a/views/css/admin.css b/views/css/admin.css index d74d20f..84313d9 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -182,6 +182,34 @@ table.wpsgitrecht_table { width:100%; } .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; } +.v3Design_leistungsortregelCheckbox { padding-left: 15px; padding-right: 15px; } +.addedit_templateV3 .form-control-feedback:hover { cursor: pointer; } +.addedit_templateV3 .form-control-feedback { z-index: 99999; } +.addedit_templateV3 .form-control-feedback:hover { } +.addedit_templateV3 .postbox { border-radius: 3px; } +.addedit_templateV3 .postbox .inside { padding-bottom: 0; } +.addedit_templateV3 .col-sm-6 { width: 100% !important; margin-left: 0 !important; } +.addedit_templateV3 #wpsg_generally .col-sm-6 { width: 80% !important; } +.addedit_templateV3 #wpsg_generally label.col-sm-6 { width: 20% !important; } +.addedit_templateV3 .general-panel-block { display: block; position: relative; width: 100%; height: auto; } +.addedit_templateV3 .general-panel-subblock { display: flex; justify-content: center; align-items: center; width: 100%; height: 100%; } +.addedit_templateV3 .general-panel-urlnotification, +.addedit_templateV3 .general-panel-ordercondition { width: 50%; position: relative; display: block; } +.addedit_templateV3 .general-panel-urlnotification .panel, +.addedit_templateV3 .general-panel-ordercondition .panel { width: 99%; display: block; position: relative; margin: 0 auto 20px auto; height: 135px; } +.addedit_templateV3 .general-panel-ordercondition .panel-body { display: flex; justify-content: flex-start; align-items: center; width: 100%; height: 85%; margin-top: -10px; } +.addedit_templateV3 .general-panel-urlnotification .form-group:first-child { width: 100% !important; } +.addedit_templateV3 .general-panel-urlnotification .form-group-sm{ width: 50%; padding: 0; margin: 0 auto; float: left; } +.addedit_templateV3 .texte-title { color: #72777c; padding: 10px 15px; border-bottom: 1px solid transparent; font-size: 15px; } +.addedit_templateV3 .panel-general .wpsg_field_wrap { padding-right: 15px; } +.addedit_templateV3 .panel-texte .wpsg_handlediv { width: 100%; display: flex; justify-content: flex-start; align-items: center; padding: 10px; } +.addedit_templateV3 .panel-texte .panel-heading { height: fit-content; width: 100%; } +.addedit_templateV3 .mod-area .wpsg_field_wrap { padding-right: 0px !important; } +.addedit_templateV3 #wpsg_paymentmethods .last-form-group, +.addedit_templateV3 #wpsg_paymentmethods .last-form-group .form-control{ margin-bottom: 2.5px !important; } +.addedit_templateV3 br { display: none; } +.addedit_templateV3 #wpsg_images br, +.addedit_templateV3 #wpsg_mods br:first-child{ display: block !important; } /* Bild allgemein */ .box_img_wrap { position:relative; padding-top:100%; border:1px solid #000000; background:transparent; } diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml index c904e66..ca8ce30 100644 --- a/views/produkt/addedit_general.phtml +++ b/views/produkt/addedit_general.phtml @@ -5,86 +5,99 @@ */ ?> - - - view['data']['name']), array('placeholder' => __('Bitte hier den Produktnamen eingeben', 'wpsg'))); ?> - __('veröffentlicht', 'wpsg'), '1' => __('Entwurf', 'wpsg')), wpsg_getStr($this->view['data']['disabled'])); ?> +
+
+ - isMultiLingual()) { ?> - + view['data']['name']), array('placeholder' => __('Bitte hier den Produktnamen eingeben', 'wpsg'))); ?> + + __('veröffentlicht', 'wpsg'), '1' => __('Entwurf', 'wpsg')), wpsg_getStr($this->view['data']['disabled'])); ?> + + isMultiLingual()) { ?> + getStoreLanguages() as $a) { ?> - getDefaultLanguageCode())) { ?> - getDefaultLanguageCode()) { ?> - + getDefaultLanguageCode())) { ?> + getDefaultLanguageCode()) { ?> + - + <?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?> - - - - view['data']['detailname'])); ?> - view['data']['shortdesc'])); ?> - view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?> - view['data']['id']), array('readonly' => true)); ?> - - - view['data']['anr'])); ?> - view['templates']) || sizeof($this->view['templates']) <= 0) { ?> - 'wpsg_error')); ?> - - view['templates'][-1] = __('Bitte auswählen', 'wpsg'); ksort($this->view['templates']); */ ?> - view['templates'], wpsg_getStr($this->view['data']['ptemplate_file']), array('noKeys' => true)); ?> - - - hasMod('wpsg_mod_produktartikel')) { ?> - view['partikel_select'], wpsg_getStr($this->view['data']['partikel']), array('optgroup' => true)); ?> - - - __('Nur einmal mit beliebiger Menge (Standard)', 'wpsg'), - '4' => __('Nur einmal mit Menge 1', 'wpsg'), - '1' => __('Mehrfach mit beliebiger Menge', 'wpsg'), - '2' => __('Mehrfach mit Menge 1', 'wpsg') - ), wpsg_getStr($this->view['data']['basket_multiple']), array('help' => 'basket_multiple')); ?> - - -
- - view['data']['id'])) { ?> - getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['id']))?$this->view['data']['id']:$this->view['data']['id']))); ?> - - - - - - view['data']['id'])) { ?> - view['data']['id'].'"]', array('readonly' => true)); ?> - - - - __('Nicht anzeigen', 'wpsg'), '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5'); ?> - - view['data']['rating'])); ?> - - - callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> - - - -hasMod('wpsg_mod_ordercondition')) { ?> - - callMod('wpsg_mod_ordercondition', 'produkt_edit_sidebar', array(&$this->view['data'])); ?> - - - - - - view['data']['posturl']), array('help' => 'URLBenachrichtigung')); ?> - view['data']['posturl_verkauf'])); ?> - view['data']['posturl_bezahlung'])); ?> - - \ No newline at end of file + + + + view['data']['detailname'])); ?> + view['data']['shortdesc'])); ?> + view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?> + view['data']['id']), array('readonly' => true)); ?> + + + view['data']['anr'])); ?> + view['templates']) || sizeof($this->view['templates']) <= 0) { ?> + 'wpsg_error')); ?> + + view['templates'][-1] = __('Bitte auswählen', 'wpsg'); ksort($this->view['templates']); */ ?> + view['templates'], wpsg_getStr($this->view['data']['ptemplate_file']), array('noKeys' => true)); ?> + + + hasMod('wpsg_mod_produktartikel')) { ?> + view['partikel_select'], wpsg_getStr($this->view['data']['partikel']), array('optgroup' => true)); ?> + + + __('Nur einmal mit beliebiger Menge (Standard)', 'wpsg'), + '4' => __('Nur einmal mit Menge 1', 'wpsg'), + '1' => __('Mehrfach mit beliebiger Menge', 'wpsg'), + '2' => __('Mehrfach mit Menge 1', 'wpsg') + ), wpsg_getStr($this->view['data']['basket_multiple']), array('help' => 'basket_multiple')); ?> + + +
+ + view['data']['id'])) { ?> + getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['id']))?$this->view['data']['id']:$this->view['data']['id']))); ?> + + + + + + view['data']['id'])) { ?> + view['data']['id'].'"]', array('readonly' => true)); ?> + + + + __('Nicht anzeigen', 'wpsg'), '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5'); ?> + + view['data']['rating'])); ?> + + + callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> + + +
+ +
+
+ hasMod('wpsg_mod_ordercondition')) { ?> + + callMod('wpsg_mod_ordercondition', 'produkt_edit_sidebar', array(&$this->view['data'])); ?> + + +
+ +
+ + + view['data']['posturl']), array('help' => 'URLBenachrichtigung')); ?> + view['data']['posturl_verkauf'])); ?> + view['data']['posturl_bezahlung'])); ?> + + +
+
+ +
+ diff --git a/views/produkt/addedit_templateV3.phtml b/views/produkt/addedit_templateV3.phtml new file mode 100644 index 0000000..150b98d --- /dev/null +++ b/views/produkt/addedit_templateV3.phtml @@ -0,0 +1,362 @@ + + + + +
+ +
+ +

+

+ 0) { ?> + + +  [getStoreLanguages(); echo $arLang[$_REQUEST['wpsg_lang']]['name']; ?> ] + + + + +

+
+ + writeBackendMessage(); ?> + +
+ +
+ +
+
+ + +
+
+ + view['arSubAction']['price']['content']; ?> + +
+
+
+
+ + view['arSubAction']['payship']['content']; ?> + +
+
+ + + callMods('produkt_edit_sidebar_contentt', array(&$this->view['data'])); ?> + +
+
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ + view['arSubAction']['general']['content']; ?> + +
+
+ +
+

+
+ +

+
+ + view['arSubAction']['texte']['content']; ?> + +
+
+ +
+
+ + view['arSubAction']['images']['content']; ?> + +
+
+ +
+
+ + view['arSubAction']['stock']['content']; ?> + +
+
+ +
+

Aktivierte Mods

+ view['arSubAction'] as $index => $subArr) + { + if(strpos($index, 'wpsg_mod') !== false) + { + + $modtitle = $this->view['arSubAction'][$index]['title']; + + echo "
"; + echo $this->view['arSubAction'][$index]['content']; + echo '
'; + + } + } + + ?> +
+ + callMods('produkt_edit_content', array(&$this->view['data'])); ?> + +
+ + 0) { ?> + + + + + + + +

+ + +

+ +
+ +
+ +
+ +
\ No newline at end of file -- cgit v1.2.3