From 6e3783cb429e327bb1c4a5a8b760b2f76da1f25c Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Sun, 6 Mar 2016 16:51:09 +0000 Subject: - Online Test - Dialog zur Shortcode generierung - Anzeige von Produktgruppen und Kategorien in Produktansichten - Produktverwaltung aufgehübscht - Entwarnt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5391 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/form/checkbox.phtml | 2 + views/admin/form/input.phtml | 2 + views/admin/form/select.phtml | 4 +- views/admin/konfiguration.phtml | 1 - views/css/admin.css | 29 + views/css/frontend.css | 5 + views/gfx/table.png | Bin 0 -> 624 bytes .../mod_productgroups/produkt_edit_sidebar.phtml | 6 +- views/mods/mod_productview/mce_plugin.js | 46 ++ views/mods/mod_productview/productview.phtml | 3 +- .../mods/mod_productview/shortcodegenerator.phtml | 114 +++ .../mod_produktartikel/produkt_edit_sidebar.phtml | 19 +- views/produkt/addedit.phtml | 875 ++++++++++----------- 13 files changed, 638 insertions(+), 468 deletions(-) create mode 100644 views/gfx/table.png create mode 100644 views/mods/mod_productview/mce_plugin.js create mode 100644 views/mods/mod_productview/shortcodegenerator.phtml diff --git a/views/admin/form/checkbox.phtml b/views/admin/form/checkbox.phtml index 8edf92b..c183513 100644 --- a/views/admin/form/checkbox.phtml +++ b/views/admin/form/checkbox.phtml @@ -15,4 +15,6 @@ +
+ \ No newline at end of file diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml index e412bcd..234b1cc 100644 --- a/views/admin/form/input.phtml +++ b/views/admin/form/input.phtml @@ -6,4 +6,6 @@ +
+ \ No newline at end of file diff --git a/views/admin/form/select.phtml b/views/admin/form/select.phtml index d0f0ee7..480f333 100644 --- a/views/admin/form/select.phtml +++ b/views/admin/form/select.phtml @@ -4,7 +4,7 @@
- view['atts_select']; ?>> view['field_values'] as $k => $v) { ?> @@ -12,4 +12,6 @@
+
+ \ No newline at end of file diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml index 85f2075..145e1cd 100644 --- a/views/admin/konfiguration.phtml +++ b/views/admin/konfiguration.phtml @@ -86,7 +86,6 @@ -
get_option('wpsg_currency'), array('help' => 'Einstellungen_Allgemein_Waehrung')); ?> diff --git a/views/css/admin.css b/views/css/admin.css index 6a6e637..d377028 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -1,4 +1,7 @@ /* Allgemein */ +.wpsg_clear { clear:both; } + +/* Bootstrap Teil */ #wpsg-bs { margin-top:20px; } #wpsg-bs nav.navbar { margin-right:20px; } #wpsg-bs nav.navbar li { margin-bottom:0px; } @@ -8,6 +11,32 @@ #wpsg-bs .pagination_wrap { text-align:right; padding-right:20px; } #wpsg-bs .pagination { margin-top:0px; margin-bottom:10px; } #wpsg-bs .content { width:100%; box-sizing:border-box; padding-right:20px; } +#wpsg-bs .form-group { margin-bottom:5px; margin-top:5px; } +#wpsg-bs .form-checkbox { margin-top:-5px; margin-bottom:0px; } + +/* Bootstrap Formulare im alten Teil */ +.wpsg_old_forms .form-group { margin-left:-15px; margin-right:-15px; margin-bottom:5px; } +.wpsg_old_forms .form-checkbox > div:first-child { width:100%; margin-left:0px; } + +/* Auswahl der Versand-/Zahlungsarten */ + +#wpsg_shippingmethods_select, +#wpsg_paymentmethods_select { margin-bottom:10px; } +.wpsg_shippingmethods_select .checkbox, +.wpsg_paymentmethods_select .checkbox { margin-top:0px; margin-bottom:0px; } + +/* Alte Formularelemente */ +.wpsg_form_field { width:100%; margin-bottom:5px; } +.wpsg_form_field_fullrow { position:relative; } +.wpsg_form_field_fullrow label { font-weight:bold; line-height:25px; } +.wpsg_form_field .wpsg_form_left { line-height:24px; font-weight:bold; width:50%; float:left; } +.wpsg_form_field .wpsg_form_right { width:50%; padding-left:15px; float:left; position:relative; } +.wpsg_form_field .wpsg_form_right select, .wpsg_form_field .wpsg_form_right input, .wpsg_form_field .wpsg_form_right textarea { width:95%; } +.wpsg_form_field .wpsg_form_right input.button { width:auto; } +.wpsg_form_field .wpsg_form_right input[type="checkbox"] { margin-top:-4px; margin-right:5px; } +.wpsg_form_field .wpsg_form_right label { line-height:25px; } +.wpsg_form_field .wpsg_form_right p { padding-top:5px; } +.wpsg_form_field_max select { width:100%; } /* Konfiguration */ .wpsg_admin_wrap { position:relative; } diff --git a/views/css/frontend.css b/views/css/frontend.css index 772f687..dcc7daf 100644 --- a/views/css/frontend.css +++ b/views/css/frontend.css @@ -320,6 +320,10 @@ input.wpsg_error { border-color:red !important; } .wpsg_productview_head { margin-bottom:25px; line-height:25px; margin-top:25px; } .wpsg_productview_head h2.wpsg_productview_title { margin-top:0px; font-size:20px; font-weight:bold; color:#0E2F42; } .wpsg_mod_productview-info { font-size:14px; color:#9B9B9B; } +.wpsg_mod_productview-info strong { color:#29556E; font-weight:bold; } +.wpsg_mod_productview-order { font-size:14px; color:#9B9B9B; } +.wpsg_mod_productview-order .glyphicon { margin-left:10px; margin-right:5px; } +.wpsg_mod_productview-order strong { color:#29556E; font-weight:bold; } .wpsg_mod_productview_image img { max-width:100%; height:auto; border:1px solid #E4F3F8; } .wpsg_productview_pager { width:100%; border-top:1px solid #E4F3F8; border-bottom:1px solid #E4F3F8; margin-bottom:25px; margin-top:10px; padding-top:25px; padding-bottom:25px; text-align:center; } .wpsg_productview_pager .wpsg_productview_pager_wrap { display:inline-block; margin:auto; } @@ -337,6 +341,7 @@ input.wpsg_error { border-color:red !important; } .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; } + @media screen and (max-width: 600px) { diff --git a/views/gfx/table.png b/views/gfx/table.png new file mode 100644 index 0000000..85e372e Binary files /dev/null and b/views/gfx/table.png differ diff --git a/views/mods/mod_productgroups/produkt_edit_sidebar.phtml b/views/mods/mod_productgroups/produkt_edit_sidebar.phtml index a7a90f4..c1fab76 100644 --- a/views/mods/mod_productgroups/produkt_edit_sidebar.phtml +++ b/views/mods/mod_productgroups/produkt_edit_sidebar.phtml @@ -15,9 +15,9 @@ view['wpsg_mod_productgroups']['data']) <= 0) { ?>

- view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?> - view['wpsg_mod_productgroups']['sticky_von']); ?> - view['wpsg_mod_productgroups']['sticky_bis']); ?> + view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?> + view['wpsg_mod_productgroups']['sticky_von']); ?> + view['wpsg_mod_productgroups']['sticky_bis']); ?> diff --git a/views/mods/mod_productview/mce_plugin.js b/views/mods/mod_productview/mce_plugin.js new file mode 100644 index 0000000..179e488 --- /dev/null +++ b/views/mods/mod_productview/mce_plugin.js @@ -0,0 +1,46 @@ +(function() { + + tinymce.create('tinymce.plugins.wpsgModProductviewPlugin', { + + init : function(ed, url) { + + ed.addCommand('mcewpsg2', function() { + ed.windowManager.open({ + file : 'admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_productview&noheader=1', + title: 'Produktansicht generieren', + width : 450, + height : 450, + inline : 1 + }, { + plugin_url : url + }); + }); + + ed.addButton('wpsgModProductviewPlugin', { + title : 'Produkte über die Produktansicht anzeigen', + cmd : 'mcewpsg2', + image : url + '/../../gfx/table.png' + }); + + ed.onNodeChange.add(function(ed, cm, n) { + cm.setActive('wpsgModProductviewPlugin', n.nodeName == 'IMG'); + }); + }, + + createControl : function(n, cm) { + return null; + }, + + getInfo : function() { + return { + longname : 'wpShopGermany Produktauswahl', + author : 'maennchen1.de', + authorurl : 'http://maennchen1.de', + version : "3.0" + }; + } + }); + + tinymce.PluginManager.add('wpsgModProductviewPlugin', tinymce.plugins.wpsgModProductviewPlugin); + +})(); diff --git a/views/mods/mod_productview/productview.phtml b/views/mods/mod_productview/productview.phtml index 2175f48..111f774 100644 --- a/views/mods/mod_productview/productview.phtml +++ b/views/mods/mod_productview/productview.phtml @@ -14,7 +14,8 @@ view['wpsg_mod_productview']['products'])) { ?>
- asd + + Neueste zuerst
diff --git a/views/mods/mod_productview/shortcodegenerator.phtml b/views/mods/mod_productview/shortcodegenerator.phtml new file mode 100644 index 0000000..b68b548 --- /dev/null +++ b/views/mods/mod_productview/shortcodegenerator.phtml @@ -0,0 +1,114 @@ + + + + <?php echo __('Produktansicht generieren', 'wpsg'); ?> + + + + + + + + + + + +
+ +
+ + + view['arSelect'], '-1'); ?> + + + + + + + +
+ + + + + +
+ + + \ No newline at end of file diff --git a/views/mods/mod_produktartikel/produkt_edit_sidebar.phtml b/views/mods/mod_produktartikel/produkt_edit_sidebar.phtml index a2cd9e0..b82821e 100644 --- a/views/mods/mod_produktartikel/produkt_edit_sidebar.phtml +++ b/views/mods/mod_produktartikel/produkt_edit_sidebar.phtml @@ -10,20 +10,9 @@
-
-
-
- -
-
- view['data']['comment_status'] == 'open')?'checked="checked"':''); ?> /> -
-
-
- view['data']['menu_order']); ?> +
+ view['data']['menu_order']); ?> + view['data']['comment_status']); ?>
@@ -35,7 +24,7 @@
    - view['data']['post_id'], array('taxonomy' => 'category')); ?> + view['data']['post_id'], array('taxonomy' => 'category')); ?>
diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml index 34557c2..b83cfde 100644 --- a/views/produkt/addedit.phtml +++ b/views/produkt/addedit.phtml @@ -6,242 +6,261 @@ */ ?> - - -
- -
- -

-

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

-
+ + /* ]]> */ writeBackendMessage(); ?> -
- -
- -
-
- - -
-

-

- -

-
- view['data']['mwst_key']); ?> - get_option('wpsg_preisangaben') == WPSG_NETTO) { ?> -
-
- -
-
-

get_option('wpsg_currency'); ?>

- -
-
+
+ +
+ + + +
+ +
+
+ + +
+

+

+ +

+
+ view['data']['mwst_key']); ?> + getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['preis'])); ?> + getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['oldprice'])); ?> + view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?> + view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?> + Länderverwaltung
- - get_option('wpsg_preisangaben') == WPSG_BRUTTO) { ?> -
-
- : -
-
-

get_option('wpsg_currency'); ?>

- +
+
+

+

+ +

+
+ +
+ arPayment as $p) { if (!isset($p['deleted']) || $p['deleted'] != '1') { ?> + view['allowedPayment']), array('id' => 'wpsg_paymentmethods_'.$p['id'], 'value' => $p['id'])); ?> +
-
+ +
- - view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?> - view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?> - Länderverwaltung
-
-
-

-

- -

-
- -
- arPayment as $p) { if (!isset($p['deleted']) || $p['deleted'] != '1') { ?> - view['allowedPayment']), array('id' => 'wpsg_paymentmethods_'.$p['id'], 'value' => $p['id'])); ?> - +
+

+

+ +

+
+ +
+ arShipping as $s) { if (!isset($s['deleted']) || $s['deleted'] != '1') { ?> + view['allowedShipping']), array('id' => 'wpsg_paymentmethods_'.$s['id'], 'value' => $s['id'])); ?> + +
+ + + callMods('produkt_edit_sidebar', array(&$this->view['data'])); ?> +
-
-

-

- -

-
- -
- arShipping as $s) { if (!isset($s['deleted']) || $s['deleted'] != '1') { ?> - view['allowedShipping']), array('id' => 'wpsg_paymentmethods_'.$s['id'], 'value' => $s['id'])); ?> - -
-
- - -
- - - callMods('produkt_edit_sidebar', array(&$this->view['data'])); ?> -
-
- -
- -
-
- + +
+ +
+
+ +
-
- -
- -
- -
-

-
- -

-
- isMultiLingual()) { ?> -
-
- -
-
- getStoreLanguages() as $a) { ?> - - - - - - - <?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?> - + +
+ +
+ +
+

+
+ +

+
+ isMultiLingual()) { ?> +
+
+ +
+
+ getStoreLanguages() as $a) { ?> + + + + + + + <?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?> + + - -
-
-
- -
-
- -
-
- -
-
-
- view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?> -
-
- -
-
- +
+
-
-
- - -
-
- + +
+
+ +
+
+ +
+
-
- + view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?> +
+
+ +
+
+ +
+
-
-
-
-
- + + +
+
+ +
+
+ +
+
-
- view['templates']) || sizeof($this->view['templates']) <= 0) { ?> -

- - + view['templates'] as $t) { ?> + + + - - -
-
-
-
-
- -
-
- +
- -    - -
-
-
- - - hasMod('wpsg_mod_produktartikel') && !isset($_REQUEST['wpsg_lang'])) { ?> -
-
- -
-
- +
+ +    + + +
+
+
+ + + hasMod('wpsg_mod_produktartikel') && !isset($_REQUEST['wpsg_lang'])) { ?> +
+
+ +
+
+ -
-
-
- - - - __('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') - ), @$this->view['data']['basket_multiple'], array('help' => 'basket_multiple')); ?> - - - view['data']['id'] > 0) { ?> -
-
- -
-
-

- getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['lang_parent']))?$this->view['data']['lang_parent']:$this->view['data']['id']))); ?> -

+ +
+
-
-
- - - callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> - -
-
- -
-

-
- -

-
- - + + __('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') + ), @$this->view['data']['basket_multiple'], array('help' => 'basket_multiple')); ?> + + view['data']['id'] > 0) { ?> +
+
+ +
+
+

+ getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['lang_parent']))?$this->view['data']['lang_parent']:$this->view['data']['id']))); ?> +

+
+
+
+ - wp_print_scripts('editor'); - if (function_exists('add_thickbox')) add_thickbox(); - wp_print_scripts('media-upload'); - if (function_exists('wp_tiny_mce')) wp_tiny_mce(); - wp_admin_css(); + callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?> - do_action("admin_print_styles-post-php"); - do_action('admin_print_styles'); +
+
+ +
+

+
+ +

+
+ + view['data']['beschreibung'], 'beschreibung'); - - ?> - + add_filter('tiny_mce_before_init', 'wpsg_formatTinyMCE'); + add_filter('admin_head','wpsg_ShowTinyMCE'); + wp_editor(@$this->view['data']['beschreibung'], 'beschreibung'); + + ?> + +
+ + callMods('produkt_edit_content', array(&$this->view['data'])); ?> +
- - callMods('produkt_edit_content', array(&$this->view['data'])); ?> + + 0) { ?> + + + + + + +

+ + +

+
- - 0) { ?> - - - - - - - -

- - -

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