From fa949a5f112cc861fb518f6459f2bd4c7a22159b Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Wed, 18 May 2016 15:51:59 +0000 Subject: - Neues Variantenmodul git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5488 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/kundendaten_tab2.phtml | 4 +- views/admin/module.phtml | 11 +- views/css/admin.css | 17 +- views/js/admin.js | 6 + views/js/editable.js | 7 +- .../produkt_addedit_sidebar.phtml | 5 +- views/mods/mod_productvariants/admin_edit.phtml | 172 ++++++++++++++++ views/mods/mod_productvariants/admin_html.phtml | 226 +++++++++++++++++++++ views/mods/mod_productvariants/admin_show.phtml | 102 ++++++++++ .../produkt_addedit_content.phtml | 33 +++ views/mods/mod_productvariants/settings_edit.phtml | 22 ++ 11 files changed, 596 insertions(+), 9 deletions(-) create mode 100644 views/mods/mod_productvariants/admin_edit.phtml create mode 100644 views/mods/mod_productvariants/admin_html.phtml create mode 100644 views/mods/mod_productvariants/admin_show.phtml create mode 100644 views/mods/mod_productvariants/produkt_addedit_content.phtml create mode 100644 views/mods/mod_productvariants/settings_edit.phtml (limited to 'views') diff --git a/views/admin/kundendaten_tab2.phtml b/views/admin/kundendaten_tab2.phtml index 7be3fa8..836256a 100644 --- a/views/admin/kundendaten_tab2.phtml +++ b/views/admin/kundendaten_tab2.phtml @@ -45,7 +45,7 @@ - + /* ]]> */ diff --git a/views/admin/module.phtml b/views/admin/module.phtml index 2185d1f..4e1ee4b 100644 --- a/views/admin/module.phtml +++ b/views/admin/module.phtml @@ -37,14 +37,14 @@ arAllModule[$_REQUEST['modul']]->name); ?>
-

+ -

arAllModule[$_REQUEST['modul']]->desc; ?>

+

arAllModule[$_REQUEST['modul']]->desc; ?>


get_option($_REQUEST['modul'], $this->view['global']); ?> __('Nein', 'wpsg'), '1' => __('Ja', 'wpsg')), ((wpsg_isSizedInt($modul_install))?'1':'0')); ?> @@ -94,6 +94,11 @@ arAllModule[$_REQUEST['modul']]->inline !== true) { ?> + + arModule) && (!isset($this->arAllModule[$_REQUEST['modul']]->version) || (($this->arAllModule[$_REQUEST['modul']]->free === true || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) || $this->arAllModule[$_REQUEST['modul']]->getDemoDays() > 0)))) { ?> + arModule[$_REQUEST['modul']]->settings_edit_afterform(); ?> + + diff --git a/views/css/admin.css b/views/css/admin.css index a46a738..ab93e34 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -30,6 +30,7 @@ #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; } +#wpsg-bs .modal-dialog { width:70%; } /* Inline Edit */ #wpsg-bs .editableform > .control-group > div { padding-left:15px; padding-right:15px; } @@ -83,7 +84,7 @@ .wpsg_admin_submenu { width:180px; float:left; } .wpsg_admin_content { padding-left:20px; width:800px; float:left; } .wpsg_admin_content h3 { margin:20px; } -.wpsg_admin_content h3.panel-title { margin-bottom:0px; } +.wpsg_admin_content h3.panel-title { margin:0px; } .wpsg_admin_submenu .list-group-item { padding:5px 10px; } .list-group { margin-bottom:15px !important; } @@ -127,4 +128,18 @@ .wpsg_produkt_pa_label { margin-left:10px; } #wpsg_produktattribute .wpsg_form_field { padding:10px 0; } +/* Modul Produktvarianten */ +.wpsg_mod_productvariants_table_variants .col_action { text-align:right; width:60px; } +.wpsg_mod_productvariants_table_variants .col_products { text-align:center; width:75px; } +.wpsg_mod_productvariants_table_variants .col_vari { width:75px; text-align:center; } +.wpsg_mod_productvariants_table_variants .col_id { width:50px; } +.wpsg_mod_productvariants_table_variation .col_action { text-align:right; width:75px; } +.wpsg_mod_productvariants_table_variation tbody:nth-child(even) td { background-color:#F9F9F9; } +.wpsg_mod_productvariants_table_variation .col_id { width:50px; } +.wpsg_mod_productvariants_table_variation .col_active { width:25px; } +.wpsg_mod_productvariants_info { font-style:italic; font-size:0.9em; } +.wpsg_mod_productvariants_dialog_noDialog { border:1px solid #DDDDDD; padding:5px; margin:-5px; margin-top:15px; margin-bottom:15px; } +.wpsg_mod_productvariants_dialog_noDialog .modal-body { padding:1rem 0px; } +.wpsg_mod_productvariants_dialog_noDialog .modal-footer { padding:1rem 0px; } + #beschreibung_ifr { height:500px; } \ No newline at end of file diff --git a/views/js/admin.js b/views/js/admin.js index f1ad1d3..a8b254d 100644 --- a/views/js/admin.js +++ b/views/js/admin.js @@ -19,6 +19,12 @@ wpsg_number_format = function (number, decimals, dec_point, thousands_sep) { ui.children().each(function() { + jQuery(this).find('td').each(function() { + + jQuery(this).width(jQuery(this).width()); + + } ); + jQuery(this).width(jQuery(this).width()); } ); diff --git a/views/js/editable.js b/views/js/editable.js index 6bf8e65..7da81f2 100644 --- a/views/js/editable.js +++ b/views/js/editable.js @@ -20,7 +20,12 @@ if(jQuery.trim(value) == '') { return wpsg_ajax.ie_validate_empty; } - } + }, + 'display': function(value, sourceData) { + + jQuery(this).html(sourceData); + + } } ); } ); diff --git a/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml index c48ca36..78fc497 100644 --- a/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml @@ -22,8 +22,9 @@

- -

+ +
+ \ No newline at end of file diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml new file mode 100644 index 0000000..4896638 --- /dev/null +++ b/views/mods/mod_productvariants/admin_edit.phtml @@ -0,0 +1,172 @@ + + + + + +view['arVariation'])) { ?> + + + + + + view['product_id'])) { ?> + + + + + + + view['product_id'])) { ?> + + + + + + + + + + view['arVariation'] as $vari) { $i ++; ?> + + + + view['product_id'])) { ?> + + + + + + + view['product_id'])) { ?> + + + + + + + + + + + + + + + */ ?> + + + +
+ /> + + + + get_option('wpsg_currency'))); ?> + + + +
  + TODO: Bilder +
+ + + + view['product_id'])) { ?> +

+ + + + + \ No newline at end of file diff --git a/views/mods/mod_productvariants/admin_html.phtml b/views/mods/mod_productvariants/admin_html.phtml new file mode 100644 index 0000000..f2aa433 --- /dev/null +++ b/views/mods/mod_productvariants/admin_html.phtml @@ -0,0 +1,226 @@ + + +
+ + + + +
+ + \ No newline at end of file diff --git a/views/mods/mod_productvariants/admin_show.phtml b/views/mods/mod_productvariants/admin_show.phtml new file mode 100644 index 0000000..099d8a2 --- /dev/null +++ b/views/mods/mod_productvariants/admin_show.phtml @@ -0,0 +1,102 @@ + + + + +view['arVariants'])) { ?> + + + + + + + + + view['product_id'])) { ?> + + + + + + + + view['arVariants'] as $var) { ?> + + + + + view['product_id'])) { ?> + + + + + + +
+ + +   + + view['product_id'])) echo $var['count_active'].'/'.$var['count_variation']; + else echo $var['count_variation']; + + ?> + + + + + + view['product_id']) && $this->view['product_id'] == $var['product_id']) || (!wpsg_isSizedInt($var['product_id']) && !wpsg_isSizedInt($this->view['product_id']))) { ?> + + + +
+ +

+ + + + + + \ No newline at end of file diff --git a/views/mods/mod_productvariants/produkt_addedit_content.phtml b/views/mods/mod_productvariants/produkt_addedit_content.phtml new file mode 100644 index 0000000..21b3e43 --- /dev/null +++ b/views/mods/mod_productvariants/produkt_addedit_content.phtml @@ -0,0 +1,33 @@ + + + + +view['data']['id'])) { ?> + + view['wpsg_mod_productvariants']['html']; ?> + + + + + + + + + + + + \ No newline at end of file diff --git a/views/mods/mod_productvariants/settings_edit.phtml b/views/mods/mod_productvariants/settings_edit.phtml new file mode 100644 index 0000000..019f4f5 --- /dev/null +++ b/views/mods/mod_productvariants/settings_edit.phtml @@ -0,0 +1,22 @@ + + +

+ +view['wpsg_mod_productvariants']['html']; ?> + + + \ No newline at end of file -- cgit v1.2.3