diff options
| -rw-r--r-- | views/admin/form/adminbox.phtml | 6 | ||||
| -rw-r--r-- | views/admin/module.phtml | 39 | ||||
| -rw-r--r-- | views/css/admin.css | 13 | ||||
| -rw-r--r-- | views/css/frontend.css | 24 | ||||
| -rw-r--r-- | views/mods/mod_productview/productview.js | 20 | ||||
| -rw-r--r-- | views/mods/mod_productview/productview.phtml | 53 | ||||
| -rw-r--r-- | views/mods/mod_produktartikel/produkt_addedit_content.phtml | 31 | ||||
| -rw-r--r-- | views/mods/mod_produktartikel/produkt_edit_allgemein.phtml | 12 | ||||
| -rw-r--r-- | views/mods/mod_produktartikel/produkt_edit_sidebar.phtml | 33 | ||||
| -rw-r--r-- | views/mods/mod_produktartikel/settings_edit.phtml | 84 | ||||
| -rw-r--r-- | views/mods/mod_produktbilder/produkt_addedit_content.phtml | 5 | ||||
| -rw-r--r-- | views/produkt/addedit.phtml | 9 | ||||
| -rw-r--r-- | views/produkt/addedit_general.phtml | 11 | ||||
| -rw-r--r-- | views/produkt/addedit_payship.phtml | 8 | ||||
| -rw-r--r-- | views/produkt/addedit_price.phtml | 4 | ||||
| -rw-r--r-- | views/produkt/addedit_texte.phtml | 4 | ||||
| -rw-r--r-- | views/produkt/index.phtml | 2 |
17 files changed, 165 insertions, 193 deletions
diff --git a/views/admin/form/adminbox.phtml b/views/admin/form/adminbox.phtml deleted file mode 100644 index 4ae712c..0000000 --- a/views/admin/form/adminbox.phtml +++ /dev/null @@ -1,6 +0,0 @@ -<div class="panel panel-default">
- <div class="panel-heading clearfix">
- <h3 class="panel-title"><?php echo $this->view['title']; ?></h3>
- </div>
- <div class="panel-body"><?php echo $this->view['content']; ?></div>
-</div>
\ No newline at end of file diff --git a/views/admin/module.phtml b/views/admin/module.phtml index 4d08b2d..985cb63 100644 --- a/views/admin/module.phtml +++ b/views/admin/module.phtml @@ -50,29 +50,22 @@ <?php if (isset($this->arAllModule[$_REQUEST['modul']]->version)) { ?>
<?php echo wpsg_drawForm_Input('', __('Version', 'wpsg'), $this->arAllModule[$_REQUEST['modul']]->version, array('text' => true)); ?>
- <div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <?php echo __("Lizenz", "wpsg"); ?>:
- </div>
- <div class="wpsg_form_right">
- <p>
- <?php if (isset($this->arAllModule[$_REQUEST['modul']]->free) && $this->arAllModule[$_REQUEST['modul']]->free === true) { ?>
- <?php echo __('Kostenfrei', 'wpsg'); ?>
- <?php } else { ?>
- <?php if (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) { ?>
- <?php echo __('Aktiviert', 'wpsg'); ?>
- <?php } else { ?>
- <?php if ($this->arAllModule[$_REQUEST['modul']]->getDemoDays() > 0) { ?>
- <?php echo wpsg_translate(__('Demo Modus noch #1# Tage verbleibend.', 'wpsg'), $this->arAllModule[$_REQUEST['modul']]->getDemoDays()); ?>
- <?php } else { ?>
- <?php echo __('Demo Modus abgelaufen.', 'wpsg'); ?>
- <?php } ?>
- <?php } ?>
- <?php } ?>
- </p>
- </div>
- <div class="wpsg_clear"></div>
- </div>
+
+ <?php if (isset($this->arAllModule[$_REQUEST['modul']]->free) && $this->arAllModule[$_REQUEST['modul']]->free === true) { ?>
+ <?php $strLizenz = __('Kostenfrei', 'wpsg'); ?>
+ <?php } else { ?>
+ <?php if (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) { ?>
+ <?php $strLizenz = __('Aktiviert', 'wpsg'); ?>
+ <?php } else { ?>
+ <?php if ($this->arAllModule[$_REQUEST['modul']]->getDemoDays() > 0) { ?>
+ <?php $strLizenz = wpsg_translate(__('Demo Modus noch #1# Tage verbleibend.', 'wpsg'), $this->arAllModule[$_REQUEST['modul']]->getDemoDays()); ?>
+ <?php } else { ?>
+ <?php $strLizenz = __('Demo Modus abgelaufen.', 'wpsg'); ?>
+ <?php } ?>
+ <?php } ?>
+ <?php } ?>
+ <?php echo wpsg_drawForm_Text(__('Lizenz'), $strLizenz); ?>
+
<?php } ?>
<?php if (!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))) { ?>
diff --git a/views/css/admin.css b/views/css/admin.css index 3b2e3c2..ea81def 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -25,6 +25,9 @@ #wpsg-bs .form-group-sm .form-control { padding-left:8px; }
#wpsg-bs .form-select .form-control { padding-left:5px; }
#wpsg-bs .form-group-sm .form-control-static { padding-left:10px; height:auto; }
+#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; }
/* Inline Edit */
#wpsg-bs .editableform > .control-group > div { padding-left:15px; padding-right:15px; }
@@ -80,7 +83,6 @@ .wpsg_admin_content h3 { margin-top:0px; margin-bottom:25px; }
.wpsg_admin_content h3.panel-title { margin-bottom:0px; }
.wpsg_admin_submenu .list-group-item { padding:5px 10px; }
-.wpsg_admin .list-group-head { background-color:#666666; color:#FFFFFF; border:1px solid #666666; }
.list-group { margin-bottom:15px !important; }
/* Produktverwaltung */
@@ -101,9 +103,14 @@ /* Formularanpassungen */
.form-checkbox label { font-size:12px; line-height:200%; }
-/* Produktbilder */
+/* Modul Produktbilder (wpsg_mod_produktbilder) */
#produktbilder_target img { }
.wpsg_mod_produktbilder_admin_bild a { position:relative; display:inline-block; float:left; margin-right:5px; margin-bottom:5px; }
.wpsg_mod_produktbilder_admin_bild a > span { left:0px; top:0px; display:none; position:absolute; width:100%; height:100%; text-align:center; background-color:rgba(255, 0, 0, 0.3); }
.wpsg_mod_produktbilder_admin_bild a > span > span { font-size:30px; top:50%; margin-top:-15px; }
-.wpsg_mod_produktbilder_admin_bild a:hover > span { display:block; }
\ No newline at end of file +.wpsg_mod_produktbilder_admin_bild a:hover > span { display:block; }
+
+/* Modul Produktartikel (wpsg_mod_produktartikel) */
+.wpsg-mod_produktartikel_categorydiv .tabs-panel { padding-top:8px !important; }
+.wpsg-mod_produktartikel_categorydiv label { font-weight:normal; font-size:14px; }
+.wpsg-mod_produktartikel_categorydiv label input[type="checkbox"] { margin-top:-2px; }
\ No newline at end of file diff --git a/views/css/frontend.css b/views/css/frontend.css index a5752a4..80a7e8f 100644 --- a/views/css/frontend.css +++ b/views/css/frontend.css @@ -330,18 +330,22 @@ input.wpsg_error { border-color:red !important; } .wpsg_productview_pager .wpsg_productview_pager_wrap { display:inline-block; margin:auto; }
.wpsg_productview_pager .wpsg_productview_pager_wrap > span,
.wpsg_productview_pager .wpsg_productview_pager_wrap > a { display:inline-block; width:30px; height:30px; line-height:30px; color:#0F303F; border:1px solid #0F303F; margin-left:15px; margin-right:15px; }
-.wpsg_productview_product { padding-top:15px; padding-bottom:15px; position:relative; margin-bottom:25px; }
-.wpsg_productview_product .wpsg_mod_productview_bottom { position:relative; display:table; width:100%; }
-.wpsg_productview_product .wpsg_mod_productview_name { display:table-cell; }
-.wpsg_productview_product .wpsg_mod_productview_name h2 { font-size:12px; color:#0F2F3E; font-weight:bold; margin-top:15px; }
-.wpsg_productview_product .wpsg_mod_productview_price_wrap { font-weight:bold; font-size:12px; display:table-cell; text-align:right; color:#0F2F3E; white-space:nowrap; }
-.wpsg_productview_product .wpsg_mod_productview_price_wrap .wpsg_mod_productview_oldprice { text-decoration: line-through; }
-.wpsg_productview_product .wpsg_mod_productview_price_wrap .wpsg_mod_productview_pricehiglight { color:#FF0000; }
-.wpsg_productview_product .wpsg_mod_productview_go { display:none; position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(0, 0, 0, 0.25); text-align:center; }
-.wpsg_productview_product .wpsg_mod_productview_go > .wpsg_star_wrap { font-size:22px; color:#0F303F; width:80%; position:absolute; left:50%; margin-left:-40%; top:10%; }
+.wpsg_productview_product { padding-top:15px; padding-bottom:40px; position:relative; margin-bottom:25px; }
+.wpsg_productview_product .wpsg_mod_productview_bottom { display:block; width:100%; text-align:center; }
+.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_name h2 { font-size:14px; font-weight:bold; margin-bottom:5px; }
+.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_description { color:#436980; line-height:20px; font-size:14px; margin-bottom:5px; }
+.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_button { left:50%; margin-left:-90px; width:180px; position:absolute; bottom:0px; white-space:nowrap; padding:5px 25px 5px 25px; border:1px solid #A6DAE8; font-weight:bold; text-transform:uppercase; color:#29556E; }
+.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_button:hover { text-decoration:none; background-color:#29556E; color:#FFFFFF; }
+.wpsg_productview_product .wpsg_mod_productview_bottom .wpsg_mod_productview_button .fa { margin-left:10px; }
+.wpsg_productview_product .wpsg_mod_productview_go { display:none; position:absolute; left:0px; top:0px; width:100%; height:100%; background-color:rgba(228, 243, 248, 1); mix-blend-mode:multiply; text-align:center; }
+.wpsg_productview_product .wpsg_mod_productview_go > .wpsg_star_wrap { font-size:22px; color:#0F303F; width:80%; position:absolute; left:50%; margin-left:-40%; top:10%; font-size:18px; font-weight:normal; }
+.wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_price_wrap { color:#0F303F; width:100%; position:absolute; left:50%; margin-left:-50%; top:30%; font-size:20px; line-height:125%; font-weight:bold; }
+.wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_price_wrap .wpsg_mod_productview_oldprice { text-decoration:line-through; }
+.wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_price_wrap .wpsg_mod_productview_current { color:red; }
+.wpsg_productview_product .wpsg_mod_productview_go .wpsg_mod_productview_tax_wrap { color:#565656; width:100%; position:absolute; left:50%; margin-left:-50%; top:60%; font-size:14px; line-height:125%; }
.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; }
+.wpsg_mod_productview_loading { width:100%; height:100%; background-color:rgba(249, 252, 253, 0.75); position:absolute; left:0px; top:0px; }
@media screen and (max-width: 600px) {
diff --git a/views/mods/mod_productview/productview.js b/views/mods/mod_productview/productview.js index 54a9df6..89704d7 100644 --- a/views/mods/mod_productview/productview.js +++ b/views/mods/mod_productview/productview.js @@ -19,6 +19,7 @@ 'success': function(data) {
jQuery('#wpsg_productview_' + index).replaceWith(data);
+ wpsg_correctProductview(index);
}
} );
@@ -26,4 +27,23 @@ return false;
}
+
+ function wpsg_correctProductview(index)
+ {
+
+ var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_name').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height);
+ var max_height = 0; jQuery('#wpsg_productview_' + index + ' .wpsg_mod_productview_description').each(function() { if (jQuery(this).outerHeight() > max_height) max_height = jQuery(this).outerHeight(); } ).outerHeight(max_height);
+
+ }
+
+ jQuery(document).ready(function() {
+
+ jQuery('.wpsg_productview').each(function() {
+
+ var x = jQuery(this).attr("id").substr(17);
+ wpsg_correctProductview(x);
+
+ } );
+
+ } );
\ No newline at end of file diff --git a/views/mods/mod_productview/productview.phtml b/views/mods/mod_productview/productview.phtml index 7b0e591..5897387 100644 --- a/views/mods/mod_productview/productview.phtml +++ b/views/mods/mod_productview/productview.phtml @@ -35,7 +35,7 @@ <?php if (wpsg_isSizedArray($this->view['wpsg_mod_productview']['products'])) { ?>
<?php $i = 0; foreach ($this->view['wpsg_mod_productview']['products'] as $oProduct) { $i ++; ?>
- <a title="<?php echo wpsg_hspc(wpsg_translate(__('Zum Produkt "#1#"', 'wpsg'), $oProduct->getProductName())); ?>" href="<?php echo $oProduct->getProductURL(); ?>" class="wpsg_productview_product wpsg_productview_product_<?php echo $oProduct->id; ?> col-lg-3">
+ <div class="wpsg_productview_product wpsg_productview_product_<?php echo $oProduct->id; ?> col-lg-3">
<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>
<?php $image_url = $this->callMod('wpsg_mod_produktbilder', 'getProductImage', array($oProduct->id, 520, 520, 'sz')); ?>
@@ -47,21 +47,33 @@ <div class="wpsg_mod_productview_go">
<div class="wpsg_star_wrap">
<?php $star = rand(0, 5); ?>
- <?php for ($i = 0; $i <= 5; $i ++) { ?><i class="fa fa-star-o"></i><?php } ?>
+ <?php for ($i = 0; $i < 5; $i ++) { ?><i class="fa fa-star<?php echo (($i >= $star)?'-o':''); ?>"></i><?php } ?>
</div>
<div class="wpsg_center">
- <div class="wpsg_price"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>
-
- <?php if ($this->getFrontendTaxview() == WPSG_BRUTTO) { ?>
- <?php // echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
- <?php } else if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
+
+ <div class="wpsg_mod_productview_price_wrap">
+ <?php $oldPrice = $oProduct->getOldPrice(); ?>
+ <?php if ($oldPrice !== false && $oldPrice != $oProduct->getPrice()) { ?>
+ <div class="wpsg_mod_productview_oldprice"><?php echo wpsg_ff($oldPrice, $this->get_option('wpsg_currency')); ?></div>
+ <div class="wpsg_mod_productview_current"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>
+ <?php } else { ?>
+ <div class="wpsg_mod_productview_price"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>
+ <?php } ?>
+ </div>
- <?php } ?>
+ <div class="wpsg_mod_productview_tax_wrap">
+ <?php if ($this->getFrontendTaxview() == WPSG_BRUTTO) { ?>
+ <?php echo wpsg_translate(__('inkl. #1#% MwSt. zzgl. <a href="#2">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
+ <?php } else if ($this->getFrontendTaxview() == WPSG_NETTO) { ?>
+ <?php echo wpsg_translate(__('zzgl. #1#% MwSt. zzgl. <a href="#2">Versandkosten</a>', 'wpsg'), $oProduct->getFrontendTaxValue(), $this->getUrl(wpsg_ShopController::URL_VERSANDKOSTEN)); ?>
+ <?php } ?>
+ </div>
</div>
</div>
-
+
</div>
+
<?php } } ?>
<div class="wpsg_mod_productview_bottom">
@@ -70,26 +82,17 @@ <h2><?php echo $oProduct->getProductName(); ?></h2>
</div>
- <div class="wpsg_mod_productview_price_wrap">
-
- <?php $oldPrice = $oProduct->getOldPrice(); ?>
- <?php if ($oldPrice !== false) { ?>
- <div class="wpsg_mod_productview_oldprice"><?php echo wpsg_ff($oldPrice, $this->get_option('wpsg_currency')); ?></div>
- <?php } ?>
-
- <?php if ($oProduct->getMinPrice() != $oProduct->getPrice()) { ?>
- <div class="<?php echo (($oldPrice !== false)?'wpsg_mod_productview_pricehiglight':''); ?> wpsg_mod_productview_price wpsg_mod_productview_minprice"><?php echo wpsg_translate(__('Ab #1#', 'wpsg'), wpsg_ff($oProduct->getMinPrice(), $this->get_option('wpsg_currency'))); ?></div>
- <?php } else { ?>
- <div class="<?php echo (($oldPrice !== false)?'wpsg_mod_productview_pricehiglight':''); ?> wpsg_mod_productview_price"><?php echo wpsg_ff($oProduct->getPrice(), $this->get_option('wpsg_currency')); ?></div>
- <?php } ?>
-
+ <div class="wpsg_mod_productview_description">
+ <?php echo $oProduct->shortdesc; ?>
</div>
+ <a class="wpsg_mod_productview_button" href="<?php echo $oProduct->getProductURL(); ?>"><?php echo __('Zum Produkt', 'wpsg'); ?><span class="fa fa-angle-double-right"></span></a>
+
</div>
<input type="hidden" name="wpsg_atts" value="<?php echo @wpsg_hspc(serialize($this->view['wpsg_mod_productview']['atts'])); ?>" />
- </a>
+ </div>
<?php if ($i % 4 === 0) { ?>
<div class="clearfix visible-lg-block"></div>
@@ -98,7 +101,7 @@ <?php } ?>
<?php } else { ?>
- <?php echo __('Keine Produkte in dieser Ansicht.', 'wpsg'); ?>
+ <div class="col-lg-12"><?php echo __('Keine Produkte in dieser Ansicht.', 'wpsg'); ?></div>
<?php } ?>
<div class="clearfix"></div>
@@ -125,4 +128,4 @@ </div>
-</div>
\ No newline at end of file +</div>
\ No newline at end of file diff --git a/views/mods/mod_produktartikel/produkt_addedit_content.phtml b/views/mods/mod_produktartikel/produkt_addedit_content.phtml new file mode 100644 index 0000000..a06069e --- /dev/null +++ b/views/mods/mod_produktartikel/produkt_addedit_content.phtml @@ -0,0 +1,31 @@ +<?php
+
+ /**
+ * Admin Template für die Integration des Moduls "Produktartikel" in die Produktverwaltung
+ */
+
+?>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Kategorieauswahl', 'wpsg')); ?>
+
+ <div id="taxonomy-category" class="wpsg-mod_produktartikel_categorydiv categorydiv">
+
+ <div id="category-all" class="tabs-panel">
+ <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
+ <?php wp_terms_checklist(wpsg_getStr($this->view['data']['post_id']), array('taxonomy' => 'category')); ?>
+ </ul>
+ </div>
+ </div>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
+<?php echo wpsg_drawForm_AdminboxStart(__('Einstellungen zum Produktartikel', 'wpsg')); ?>
+
+ <?php echo wpsg_drawForm_Input('wpsg_produktartikel_menuorder', __('Position', 'wpsg'), wpsg_getStr($this->view['data']['menu_order'])); ?>
+ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel[kommentare]', __('Kommentare', 'wpsg'), wpsg_getStr($this->view['data']['comment_status'])); ?>
+
+ <br />
+ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktartikel"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Produktartikel', 'wpsg'); ?></a>
+
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
+
diff --git a/views/mods/mod_produktartikel/produkt_edit_allgemein.phtml b/views/mods/mod_produktartikel/produkt_edit_allgemein.phtml index 5de94cf..7e84fe0 100644 --- a/views/mods/mod_produktartikel/produkt_edit_allgemein.phtml +++ b/views/mods/mod_produktartikel/produkt_edit_allgemein.phtml @@ -6,14 +6,4 @@ */
?>
-<div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label for="wpsg_produktartikel_path"><?php echo __('URL Path Segment', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <input id="wpsg_produktartikel_path" type="text"
- name="wpsg_mod_produktartikel[path]"
- value="<?php echo $this->view['data']['post_name']; ?>" />
- </div>
- <div class="wpsg_clear"></div>
-</div>
\ No newline at end of file +<?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel[path]', __('URL Path Segment', 'wpsg'), wpsg_getStr($this->view['data']['post_name'])); ?>
\ 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 deleted file mode 100644 index b82821e..0000000 --- a/views/mods/mod_produktartikel/produkt_edit_sidebar.phtml +++ /dev/null @@ -1,33 +0,0 @@ -<?php
-
-/**
- * Dieses Template wird in der Produktverwaltung in der rechten Spalte verwendet
- */
-
-?>
-<div id="wpsg_produktartikel" class="postbox">
- <h3 class="wpsg_handlediv">
- <span title="<?php echo __('Zum Ein/Ausklappen hier klicken', 'wpsg'); ?>" class="handlediv"><br /></span>
- <span><?php echo __('Produktartikel', 'wpsg'); ?> </span>
- </h3>
- <div class="inside">
- <?php echo wpsg_drawForm_Input('wpsg_produktartikel_menuorder', __('Position', 'wpsg'), @$this->view['data']['menu_order']); ?>
- <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel[kommentare]', __('Kommentare', 'wpsg'), @$this->view['data']['comment_status']); ?>
- </div>
-</div>
-
-<div id="categorydiv" class="postbox">
- <div class="handlediv" title="<?php echo __('Zum Umschalten klicken', 'wpsg'); ?>"><br /></div>
- <h3 class="hndle"><?php echo __('Kategorieauswahl', 'wpsg'); ?></h3>
- <div class="inside">
- <div id="taxonomy-category" class="categorydiv">
-
- <div id="category-all" class="tabs-panel">
- <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
- <?php wp_terms_checklist(@$this->view['data']['post_id'], array('taxonomy' => 'category')); ?>
- </ul>
- </div>
-
- </div>
- </div>
-</div>
\ No newline at end of file diff --git a/views/mods/mod_produktartikel/settings_edit.phtml b/views/mods/mod_produktartikel/settings_edit.phtml index d4c04d2..5eb8196 100644 --- a/views/mods/mod_produktartikel/settings_edit.phtml +++ b/views/mods/mod_produktartikel/settings_edit.phtml @@ -5,15 +5,7 @@ */
?>
-<div class="wpsg_form_field">
- <div class="wpsg_form_left"><?php echo __('Path Key', 'wpsg'); ?>:</div>
- <div class="wpsg_form_right">
- <input type="text" name="wpsg_mod_produktartikel_pathkey" value="<?php echo $this->get_option('wpsg_mod_produktartikel_pathkey'); ?>" />
- <a rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_produktartikel_pathkey" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_produktartikel_pathkey" class="wpsg_form_help"></a>
- </div>
- <div class="wpsg_clear"></div>
-</div>
-
+<?php echo wpsg_drawForm_Input('wpsg_mod_produktartikel_pathkey', __('Path Key', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_pathkey'), array('help' => 'mod_produktartikel_pathkey')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showui', __('Custom Post Type in Wordpress Menü sichtbar', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showui'), array('help' => 'wpsg_mod_produktartikel_showui'))?>
<?php if ($this->hasMod('wpsg_mod_produktbilder')) { ?>
@@ -26,64 +18,24 @@ <?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_showFeed', __('Direkt in den Feeds anzeigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_showFeed'), array('help' => 'wpsg_mod_produktartikel_showFeed')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_onlyMainQuery', __('Nur Main Query berücksichtigen', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_onlyMainQuery'), array('help' => 'wpsg_mod_produktartikel_onlyMainQuery')); ?>
-<div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label for="wpsg_mod_produktartikel_hometemplate"><?php echo __('Produkttemplate für Ansicht auf Startseite', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>
- <p class="wpsg_error"><?php echo __('Keine Templatedatein gefunden!', 'wpsg'); ?></p>
- <?php } else { ?>
- <select name="wpsg_mod_produktartikel_hometemplate" id="wpsg_mod_produktartikel_hometemplate">
- <option value="-1"><?php echo __('Wie Produkttemplate', 'wpsg'); ?></option>
- <?php foreach ($this->view['arTemplates'] as $t) { ?>
- <option <?php echo (($t == $this->get_option('wpsg_mod_produktartikel_hometemplate'))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($t); ?>"><?php echo wpsg_hspc($t); ?></option>
- <?php } ?>
- </select>
- <?php } ?>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_produktartikel_hometemplate" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_produktartikel_hometemplate"></a>
- </div>
- <div class="wpsg_clear"></div>
-</div>
-<div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label for="wpsg_mod_produktartikel_listtemplate"><?php echo __('Produkttemplate für List Ansicht', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>
- <p class="wpsg_error"><?php echo __('Keine Templatedatein gefunden!', 'wpsg'); ?></p>
- <?php } else { ?>
- <select name="wpsg_mod_produktartikel_listtemplate" id="wpsg_mod_produktartikel_listtemplate">
- <option value="-1"><?php echo __('Wie Produkttemplate', 'wpsg'); ?></option>
- <?php foreach ($this->view['arTemplates'] as $t) { ?>
- <option <?php echo (($t == $this->get_option('wpsg_mod_produktartikel_listtemplate'))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($t); ?>"><?php echo wpsg_hspc($t); ?></option>
- <?php } ?>
- </select>
- <?php } ?>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_produktartikel_listtemplate" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_produktartikel_listtemplate"></a>
- </div>
- <div class="wpsg_clear"></div>
-</div>
-<div class="wpsg_form_field">
- <div class="wpsg_form_left">
- <label for="wpsg_mod_produktartikel_searchtemplate"><?php echo __('Produkttemplate für Such Ansicht', 'wpsg'); ?>:</label>
- </div>
- <div class="wpsg_form_right">
- <?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>
- <p class="wpsg_error"><?php echo __('Keine Templatedatein gefunden!', 'wpsg'); ?></p>
- <?php } else { ?>
- <select name="wpsg_mod_produktartikel_searchtemplate" id="wpsg_mod_produktartikel_searchtemplate">
- <option value="-1"><?php echo __('Wie Produkttemplate', 'wpsg'); ?></option>
- <?php foreach ($this->view['arTemplates'] as $t) { ?>
- <option <?php echo (($t == $this->get_option('wpsg_mod_produktartikel_searchtemplate'))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($t); ?>"><?php echo wpsg_hspc($t); ?></option>
- <?php } ?>
- </select>
- <?php } ?>
- <a style="float:right; position:relative;" class="wpsg_form_help" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_produktartikel_searchtemplate" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=mod_produktartikel_searchtemplate"></a>
- </div>
- <div class="wpsg_clear"></div>
-</div>
+<?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>
+<?php echo wpsg_drawForm_Text(__('Produkttemplate für Ansicht auf Startseite', 'wpsg'), __('Keine Templatedateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>
+<?php } else { ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_produktartikel_hometemplate', __('Produkttemplate für Ansicht auf Startseite', 'wpsg'), wpsg_array_merge(array('-1' => __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_hometemplate')), array('help' => 'mod_produktartikel_hometemplate', 'noKeys' => true)); ?>
+<?php } ?>
+<?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>
+<?php echo wpsg_drawForm_Text(__('Produkttemplate für List Ansicht', 'wpsg'), __('Keine Templatedateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>
+<?php } else { ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_produktartikel_listtemplate', __('Produkttemplate für List Ansicht', 'wpsg'), wpsg_array_merge(array('-1' => __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_listtemplate')), array('help' => 'mod_produktartikel_listtemplate', 'noKeys' => true)); ?>
+<?php } ?>
+
+<?php if (!is_array($this->view['arTemplates']) || sizeof($this->view['arTemplates']) <= 0) { ?>
+<?php echo wpsg_drawForm_Text(__('Produkttemplate für Such Ansicht', 'wpsg'), __('Keine Templatedateien gefunden!', 'wpsg'), array('class_content_wrap' => 'wpsg_error')); ?>
+<?php } else { ?>
+<?php echo wpsg_drawForm_Select('wpsg_mod_produktartikel_searchtemplate', __('Produkttemplate für Such Ansicht', 'wpsg'), wpsg_array_merge(array('-1' => __('Wie Produkttemplate', 'wpsg')), $this->view['arTemplates']), wpsg_getStr($this->get_option('wpsg_mod_produktartikel_searchtemplate')), array('help' => 'mod_produktartikel_searchtemplate', 'noKeys' => true)); ?>
+<?php } ?>
+
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_facebook', __('Facebook Integration', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_facebook'), array('help' => 'wpsg_mod_produktartikel_facebook')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_google', __('Google+ Integration', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_google'), array('help' => 'wpsg_mod_produktartikel_google')); ?>
<?php echo wpsg_drawForm_Checkbox('wpsg_mod_produktartikel_twitter', __('Twitter Integration', 'wpsg'), $this->get_option('wpsg_mod_produktartikel_twitter'), array('help' => 'wpsg_mod_produktartikel_twitter')); ?>
diff --git a/views/mods/mod_produktbilder/produkt_addedit_content.phtml b/views/mods/mod_produktbilder/produkt_addedit_content.phtml index 25607fd..6304863 100644 --- a/views/mods/mod_produktbilder/produkt_addedit_content.phtml +++ b/views/mods/mod_produktbilder/produkt_addedit_content.phtml @@ -142,8 +142,11 @@ <br /><br />
+ <?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 />
- <a href="#" onclick="return wpsg_clearImageCache();"><span class="wpsg-glyphicon glyphicon glyphicon-trash"></span><?php echo __('Bildercache dieses Produktes löschen', 'wpsg'); ?></a><br />
+ <a href="#" onclick="return wpsg_clearImageCache();"><span class="wpsg-glyphicon glyphicon glyphicon-trash"></span><?php echo __('Bildercache dieses Produktes löschen', 'wpsg'); ?></a><br />
+ <?php } ?>
+
<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_produktbilder"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration der Produktbilder', 'wpsg'); ?></a>
</div>
diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml index 10e1946..900d013 100644 --- a/views/produkt/addedit.phtml +++ b/views/produkt/addedit.phtml @@ -30,6 +30,13 @@ <div class="wpsg_admin_submenu">
<div class="list-group" id="wpsg_product_tabs">
+
+ <?php if (wpsg_isSizedInt($this->view['data']['id'])) { ?>
+ <span class="list-group-head list-group-item"><?php echo wpsg_translate(__('Produkt ID:#1#: <span style="float:right;"><a href="#2#" title="Produkt im Frontend ansehen" target="_blank"><span class="glyphicon glyphicon-new-window"></span></a></span>', 'wpsg'), $this->view['data']['id'], $this->view['oProduct']->getProductURL()); ?></span>
+ <?php } else { ?>
+ <span class="list-group-head list-group-item"><?php echo __('Neues Produkt', 'wpsg'); ?></span>
+ <?php } ?>
+
<?php $i = 0; foreach ($this->view['arSubAction'] as $k => $v) { $i ++; ?>
<a class="list-group-item <?php echo ((wpsg_getStr($_COOKIE['wpsg_product_addedit_tab'], 'general') === $k)?'active':''); ?>" wpsg-data-target="<?php echo $k; ?>" href="#"><?php echo $v['title']; ?></a>
<?php } ?>
@@ -68,7 +75,7 @@ jQuery(document).ready(function() {
- jQuery('#wpsg_product_tabs a').bind('click', function() {
+ jQuery('#wpsg_product_tabs a.list-group-item').bind('click', function() {
jQuery('#wpsg_product_tabs a').removeClass('active');
jQuery('.wpsg_product_tab_content').hide();
diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml index 9666a95..1eb5a91 100644 --- a/views/produkt/addedit_general.phtml +++ b/views/produkt/addedit_general.phtml @@ -6,8 +6,8 @@ ?>
-<?php echo wpsg_drawForm_AdminboxStart(); ?>
- <?php echo wpsg_drawForm_Input('name', __('Produktname', 'wpsg'), $this->view['data']['name'], array('placeholder' => __('Bitte hier den Produktnamen eingeben', 'wpsg'))); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Allgemein', 'wpsg')); ?>
+ <?php echo wpsg_drawForm_Input('name', __('Produktname', 'wpsg'), wpsg_getStr($this->view['data']['name']), array('placeholder' => __('Bitte hier den Produktnamen eingeben', 'wpsg'))); ?>
<?php if ($this->isMultiLingual()) { ?>
<?php echo wpsg_drawForm_TextStart(); ?>
<?php foreach ($this->getStoreLanguages() as $a) { ?>
@@ -24,6 +24,7 @@ <?php echo wpsg_drawForm_TextEnd(__('Übersetzungen', 'wpsg')); ?>
<?php } ?>
<?php echo wpsg_drawForm_Input('detailname', __('Produktname (Detail)', 'wpsg'), wpsg_getStr($this->view['data']['detailname'])); ?>
+ <?php echo wpsg_drawForm_Input('shortdesc', __('Produktbeschreibung (Kurz)', 'wpsg'), wpsg_getStr($this->view['data']['shortdesc'])); ?>
<?php if (wpsg_isSizedInt($this->view['data']['id']) && !isset($_REQUEST['wpsg_lang'])) { ?>
<?php echo wpsg_drawForm_Input(false, __('Produkt ID', 'wpsg'), wpsg_getStr($this->view['data']['id']), array('readonly' => true)); ?>
<?php } ?>
@@ -52,12 +53,12 @@ <?php echo wpsg_drawForm_TextEnd(__('URL', 'wpsg')); ?>
<?php } ?>
<?php $this->callMods('produkt_edit_allgemein', array(&$this->view['data'])); ?>
-<?php echo wpsg_drawForm_AdminboxEnd(__('Allgemein', 'wpsg')); ?>
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
<?php if (!isset($_REQUEST['wpsg_lang'])) { ?>
-<?php echo wpsg_drawForm_AdminboxStart(); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('URL Benachrichtigung', 'wpsg')); ?>
<?php echo wpsg_drawForm_Input('posturl', __('URL', 'wpsg'), wpsg_getStr($this->view['data']['posturl']), array('help' => 'URLBenachrichtigung')); ?>
<?php echo wpsg_drawForm_Checkbox('posturl_verkauf', __('Beim Verkauf', 'wpsg'), wpsg_getStr($this->view['data']['posturl_verkauf'])); ?>
<?php echo wpsg_drawForm_Checkbox('posturl_bezahlung', __('Bei Bezahlung', 'wpsg'), wpsg_getStr($this->view['data']['posturl_bezahlung'])); ?>
-<?php echo wpsg_drawForm_AdminboxEnd(__('URL Benachrichtigung', 'wpsg')); ?>
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
<?php } ?>
diff --git a/views/produkt/addedit_payship.phtml b/views/produkt/addedit_payship.phtml index f269cbf..b9f01c6 100644 --- a/views/produkt/addedit_payship.phtml +++ b/views/produkt/addedit_payship.phtml @@ -5,7 +5,7 @@ */
?>
-<?php echo wpsg_drawForm_AdminboxStart(); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Erlaubte Zahlungsarten', 'wpsg')); ?>
<?php echo wpsg_drawForm_Select('wpsg_paymentmethods_select', '', array('0' => __('Alle', 'wpsg'), '1' => __('Auswahl', 'wpsg')), ((wpsg_isSizedArray($this->view['allowedPayment']))?'1':'0')); ?>
<div class="wpsg_paymentmethods_select">
<?php foreach ($this->arPayment as $p) { if (!isset($p['deleted']) || $p['deleted'] != '1') { ?>
@@ -28,9 +28,9 @@ } ).change();
/* ]]> */</script>
-<?php echo wpsg_drawForm_AdminboxEnd(__('Erlaubte Zahlungsarten', 'wpsg')); ?>
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
-<?php echo wpsg_drawForm_AdminboxStart(); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Erlaubte Versandarten', 'wpsg')); ?>
<?php echo wpsg_drawForm_Select('wpsg_shippingmethods_select', '', array('0' => __('Alle', 'wpsg'), '1' => __('Auswahl', 'wpsg')), ((wpsg_isSizedArray($this->view['allowedShipping']))?'1':'0')); ?>
<div class="wpsg_shippingmethods_select">
<?php foreach ($this->arShipping as $s) { if (!isset($s['deleted']) || $s['deleted'] != '1') { ?>
@@ -53,4 +53,4 @@ } ).change();
/* ]]> */</script>
-<?php echo wpsg_drawForm_AdminboxEnd(__('Erlaubte Versandarten', 'wpsg')); ?>
\ No newline at end of file +<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file diff --git a/views/produkt/addedit_price.phtml b/views/produkt/addedit_price.phtml index 673767d..445b0c4 100644 --- a/views/produkt/addedit_price.phtml +++ b/views/produkt/addedit_price.phtml @@ -1,9 +1,9 @@ -<?php echo wpsg_drawForm_AdminboxStart(); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Preis / Steuer', 'wpsg')); ?>
<?php echo wpsg_drawForm_Select('mwst_key', __('Steuergruppe', 'wpsg'), wpsg_tax_groups(true), @$this->view['data']['mwst_key']); ?>
<?php echo wpsg_drawForm_Input('preis', wpsg_translate(__('Preis (#1#)', 'wpsg'), (($this->getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['preis'])); ?>
<?php echo wpsg_drawForm_Input('oldprice', wpsg_translate(__('Alter Preis (#1#)', 'wpsg'), (($this->getBackendTaxview() === WPSG_NETTO)?'NETTO':'BRUTTO')), wpsg_ff($this->view['data']['oldprice'])); ?>
<?php echo wpsg_drawForm_Input('', __('Steueranteil', 'wpsg'), wpsg_ff(@$this->view['data']['tax_sum_value'], $this->get_option('wpsg_currency')).' / '.$this->getDefaultCountry()->kuerzel, array('text' => true)); ?>
<?php echo wpsg_drawForm_Checkbox('euleistungsortregel', __('Produkt unterliegt den EU-Leistungsortregeln', 'wpsg'), @$this->view['data']['euleistungsortregel'], array('fullrow' => true, 'help' => 'EU-Leistungsortregel')); ?>
<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&subaction=laender"><span class="glyphicon glyphicon-globe wpsg-glyphicon"></span><?php echo __('Länderverwaltung', 'wpsg'); ?></a>
-<?php echo wpsg_drawForm_AdminboxEnd(__('Preis / Steuer', 'wpsg')); ?>
+<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file diff --git a/views/produkt/addedit_texte.phtml b/views/produkt/addedit_texte.phtml index 1373796..4227c0b 100644 --- a/views/produkt/addedit_texte.phtml +++ b/views/produkt/addedit_texte.phtml @@ -6,7 +6,7 @@ ?>
-<?php echo wpsg_drawForm_AdminboxStart(); ?>
+<?php echo wpsg_drawForm_AdminboxStart(__('Beschreibung', 'wpsg')); ?>
<?php
function wpsg_ShowTinyMCE()
@@ -40,4 +40,4 @@ wp_editor(@$this->view['data']['beschreibung'], 'beschreibung');
?>
-<?php echo wpsg_drawForm_AdminboxEnd(__('Beschreibung', 'wpsg')); ?>
\ No newline at end of file +<?php echo wpsg_drawForm_AdminboxEnd(); ?>
\ No newline at end of file diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index 6b94e9b..2a8d6af 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -217,7 +217,7 @@ <?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
<td>
<div style="line-height:inherit; margin-bottom:0.2em;"><?php echo $d['stock']; ?></div>
- <?php if ($this->hasMod('wpsg_mod_varianten') && wpsg_isSizedArray($this->callMod('wpsg_mod_varianten', 'loadVarianten', array($d['id'])))) { ?>
+ <?php if ($this->hasMod('wpsg_mod_varianten')) $arVarianten = $this->callMod('wpsg_mod_varianten', 'loadVarianten', array($d['id'])); if (wpsg_isSizedArray($arVarianten)) { ?>
<div style="line-height:inherit; padding:2px 0px 0px;">
<a class="clueTip" href="#" rel="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=ajax&mod=wpsg_mod_stock&edit_id=<?php echo $d['id']; ?>&noheader=1&wpsg_cmd=getVariInfo"><?php echo __('Variantenbestand', 'wpsg'); ?></a>
</div>
|