Index: /views/admin/form/checkbox.phtml =================================================================== --- /views/admin/form/checkbox.phtml (revision 5791) +++ /views/admin/form/checkbox.phtml (revision 5792) @@ -1,10 +1,16 @@
-
+ view['field_config']['label'])) { $value_class = 'col-sm-6'; ?> + + view['field_config']['fullWidth'])) $value_class = 'col-sm-12'; + else $value_class = 'col-sm-offset-6 col-sm-6'; + + } ?> + +
Index: /views/admin/form/input.phtml =================================================================== --- /views/admin/form/input.phtml (revision 5791) +++ /views/admin/form/input.phtml (revision 5792) @@ -48,5 +48,5 @@ jQuery(document).ready(function() { - jQuery('#view['field_id']; ?>').datepicker(); + jQuery('#view['field_id']; ?>').datepicker( { dateFormat: 'dd.mm.yy' } ); } ); Index: /views/admin/module.phtml =================================================================== --- /views/admin/module.phtml (revision 5791) +++ /views/admin/module.phtml (revision 5792) @@ -70,5 +70,5 @@ - 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))) { ?> + arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) || $this->arAllModule[$_REQUEST['modul']]->getDemoDays() > 0))) { ?> arAllModule[$_REQUEST['modul']]->inline === true) { ?>

Index: /views/css/admin.css =================================================================== --- /views/css/admin.css (revision 5791) +++ /views/css/admin.css (revision 5792) @@ -220,4 +220,11 @@ .wpsg_foottextlist .col_standard { text-align:center; } +/* Modul Rabatt */ +.wpsg_mod_discount_hirarchieorder input { display:none; } +.wpsg_mod_discount_hirarchieorder li { border:1px solid #C4C4C4; border-radius:5px; width:100%; display:inline-block; margin-bottom:5px; padding:5px 5px 5px 5px; font-size:12px; cursor:move; } +.wpsg_mod_discount_seriescol { width:33%; float:left; font-size:12px; line-height:30px; } +.wpsg_mod_discount_seriescol input { width:70%; line-height:20px; float:right; } +.wpsg_mod_discount_seriescol:nth-child(2) strong { width:70%; float:right; } + #beschreibung_ifr { height:500px; } Index: /views/mods/mod_discount/settings_edit.phtml =================================================================== --- /views/mods/mod_discount/settings_edit.phtml (revision 5791) +++ /views/mods/mod_discount/settings_edit.phtml (revision 5792) @@ -7,121 +7,83 @@ ?> -
-
-
-
-
-
-
-
-
-
-
- -
- - get_option('wpsg_mod_discount_productdiscount'), array('help' =>'wpsg_mod_discount_productdiscount')); ?> - - get_option('wpsg_mod_discount_universal'), array('help' => 'wpsg_mod_discount_universal')); ?> - -
-
 
-
-
-
- -
-
-
- -
-
-
- -
-
-

-
- - hasMod('wpsg_mod_productgroups')) { ?> - get_option('wpsg_mod_discount_productgroupdiscount'), array('help' => 'wpsg_mod_discount_productgroupdiscount')); ?> - - - hasMod('wpsg_mod_customergroup')) { ?> - get_option('wpsg_mod_discount_customergroup'), array('help' => 'wpsg_mod_discount_customergroup')); ?> - - - get_option('wpsg_mod_discount_show'), array ('help' => 'wpsg_mod_discount_show')); ?> - -
-
-
- -
-
- -
    - view['wpsg_mod_discount']['hierarchie'] as $discount_typ) { ?> -
  • - - get_option('wpsg_mod_discount_hierarchie'))))?'checked="checked"':''); ?> name="wpsg_mod_discount_hierarchie[]" />  - callMod('wpsg_mod_discount', 'getNameFromType', array($discount_typ)); ?> -
    • - -
- -

- - - - -
-
-
- -
- -
- -
-
-
- -
-
-
- -
get_option('wpsg_currency')); ?>
-
-
- - view['data'] as $k => $v) { if ($k > 0) { ?> -
get_option('wpsg_currency')); ?>
-
-
-
- - -
get_option('wpsg_currency'); ?>
-
-
- -
-
-
- -
- - get_option('wpsg_mod_discount_showBasket')); ?> - -
- -
- -
+
+
    + +
    • +
+
+
+ get_option('wpsg_mod_discount_productdiscount'), array('label' => __('Aktivierte Rabatte', 'wpsg'), 'help' =>'wpsg_mod_discount_productdiscount')); ?> + get_option('wpsg_mod_discount_universal'), array('help' => 'wpsg_mod_discount_universal')); ?> + +
+ + + get_option('wpsg_mod_discount_universal_from'), array('datepicker' => true)); ?> + get_option('wpsg_mod_discount_universal_to'), array('datepicker' => true)); ?> + get_option('wpsg_mod_discount_universal_value'), array()); ?> + + true)); ?> +
+ + hasMod('wpsg_mod_productgroups')) { ?> + get_option('wpsg_mod_discount_productgroupdiscount'), array('help' => 'wpsg_mod_discount_productgroupdiscount')); ?> + + + hasMod('wpsg_mod_customergroup')) { ?> + get_option('wpsg_mod_discount_customergroup'), array('help' => 'wpsg_mod_discount_customergroup')); ?> + + + get_option('wpsg_mod_discount_show'), array ('help' => 'wpsg_mod_discount_show')); ?> + +
+ +
    + view['wpsg_mod_discount']['hierarchie'] as $discount_typ) { ?> +
  • + + get_option('wpsg_mod_discount_hierarchie'))))?'checked="checked"':''); ?> name="wpsg_mod_discount_hierarchie[]" /> + callMod('wpsg_mod_discount', 'getNameFromType', array($discount_typ)); ?> +
    • + +
+

+ + + true)); ?> + +
+ + get_option('wpsg_mod_discount_stopRabatt'), array('label' => __('Optionen', 'wpsg'))); ?> + get_option('wpsg_mod_discount_showBasket')); ?> + +
+
+ + +
+
+
+ +
get_option('wpsg_currency')); ?>
+
+
+ + view['data'] as $k => $v) { if ($k > 0) { ?> +
get_option('wpsg_currency')); ?>
+
+
+
+ + +
get_option('wpsg_currency'); ?>
+
+
+ true)); ?> + + +
+
@@ -130,12 +92,5 @@ jQuery(document).ready(function() { - jQuery("#wpsg_mod_discount_hierarchie ul").sortable().disableSelection(); - - jQuery('#wpsg_tab').wpsg_tab( { - 'cookiename': 'wpsg_mod_discount_tab', - 'tab1': function() { - jQuery('.tablink').show(); - } - } ); + jQuery("ul.wpsg_mod_discount_hirarchieorder").sortable().disableSelection(); jQuery('#wpsg_mod_discount_universal').bind('change', function() {