diff options
| author | Daniel Schmitzer <noreply@maennchen1.de> | 2016-07-03 12:17:06 +0000 |
|---|---|---|
| committer | Daniel Schmitzer <noreply@maennchen1.de> | 2016-07-03 12:17:06 +0000 |
| commit | 877575fc7cda4cca6b6ed74c9f086905522598ff (patch) | |
| tree | 4dee7f78e2ed3c65d3512ee8dcbeff92ed68d18f /views/mods | |
| parent | 5b3ab13d31190bd37f082d37558895038c06d615 (diff) | |
- commit to mac
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5637 0d5edaf7-2b12-4e95-93f4-047927463d4b
Diffstat (limited to 'views/mods')
3 files changed, 7 insertions, 11 deletions
diff --git a/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml b/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml index c3ab7ac..25d9f2b 100644 --- a/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml +++ b/views/mods/mod_fuellmenge/produkt_edit_sidebar.phtml @@ -12,8 +12,8 @@ </h3>
</div>
<div class="panel-body">
- <?php echo wpsg_drawForm_Select('feinheit', __('Einheit', 'wpsg'), $this->view['data']['arFeinheiten'], $this->view['data']['feinheit']); ?>
- <?php echo wpsg_drawForm_Input('fmenge', __('Füllmenge', 'wpsg'), wpsg_tf($this->view['data']['fmenge'])); ?>
+ <?php echo wpsg_drawForm_Select('feinheit', __('Einheit', 'wpsg'), $this->view['data']['arFeinheiten'], wpsg_getStr($this->view['data']['feinheit'])); ?>
+ <?php echo wpsg_drawForm_Input('fmenge', __('Füllmenge', 'wpsg'), wpsg_tf(wpsg_getFloat($this->view['data']['fmenge']))); ?>
<?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_einheit', __('Mögliche Einheiten (Kommagetrennt)', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_einheit'), array('help' => 'wpsg_mod_fuellmenge_einheit')); ?>
<?php echo wpsg_drawForm_Input('wpsg_mod_fuellmenge_bezug', __('Bezugsgröße', 'wpsg'), $this->get_option('wpsg_mod_fuellmenge_bezug'), array('help' => 'wpsg_mod_fuellmenge_bezug')); ?>
diff --git a/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml index 78fc497..3a790b8 100644 --- a/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml +++ b/views/mods/mod_productgroups/produkt_addedit_sidebar.phtml @@ -13,16 +13,14 @@ </div>
<div class="panel-body">
- <?php if (sizeof($this->view['wpsg_mod_productgroups']['data']) <= 0) { ?>
+ <?php if (!wpsg_isSizedArray($this->view['wpsg_mod_productgroups']['data'])) { ?>
<p><?php echo __('Bisher wurden keine Produktgruppen angelegt.', 'wpsg'); ?></p>
<?php } else { ?>
- <?php echo wpsg_drawForm_Select('wpsg_productgroup', __('Produktgruppe', 'wpsg'), @$this->view['wpsg_mod_productgroups']['data'], $this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?>
+ <?php echo wpsg_drawForm_Select('wpsg_productgroup', __('Produktgruppe', 'wpsg'), @$this->view['wpsg_mod_productgroups']['data'], @$this->view['wpsg_mod_productgroups']['produkt_data']['pgruppe']); ?>
<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_von', __('Sticky von', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_von']); ?>
<?php echo wpsg_drawForm_Input('wpsg_productgroup_sticky_bis', __('Sticky bis', 'wpsg'), @$this->view['wpsg_mod_productgroups']['sticky_bis']); ?>
<?php } ?>
-
- <br /><br />
-
+
<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&page=wpsg-Productgroups"><span class="wpsg-glyphicon glyphicon glyphicon-book"></span><?php echo __('Produktgruppenverwaltung', 'wpsg'); ?></a><br />
<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_productgroups"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Produktgruppe', 'wpsg'); ?></a>
diff --git a/views/mods/mod_produktbilder/produkt_addedit_content.phtml b/views/mods/mod_produktbilder/produkt_addedit_content.phtml index 6304863..08ddb26 100644 --- a/views/mods/mod_produktbilder/produkt_addedit_content.phtml +++ b/views/mods/mod_produktbilder/produkt_addedit_content.phtml @@ -137,10 +137,8 @@ /* ]]> */</script>
<?php } else { ?>
- <?php echo __('Das Hochladen von Produktbildern ist erst nach erstmaligem speichern möglich.', 'wpsg'); ?>
- <?php } ?>
-
- <br /><br />
+ <p><?php echo __('Das Hochladen von Produktbildern ist erst nach erstmaligem speichern möglich.', 'wpsg'); ?></p>
+ <?php } ?>
<?php if (wpsg_isSizedInt($this->view['data']['id'])) { ?>
<a href="#" data-toggle="modal" data-target="#wpsg_mod_produktbilder_ftppath"><span class="wpsg-glyphicon glyphicon glyphicon-folder-open"></span><?php echo __('FTP Pfad anzeigen', 'wpsg'); ?></a><br />
|