diff options
| -rw-r--r-- | views/admin/ueber.phtml | 11 | ||||
| -rw-r--r-- | views/css/admin.css | 5 | ||||
| -rw-r--r-- | views/produkt/addedit_general.phtml | 4 | ||||
| -rw-r--r-- | views/produkt/index.phtml | 2 | ||||
| -rw-r--r-- | views/produkttemplates/standard.phtml | 6 | ||||
| -rw-r--r-- | views/warenkorb/basket.phtml | 6 |
6 files changed, 25 insertions, 9 deletions
diff --git a/views/admin/ueber.phtml b/views/admin/ueber.phtml index d34a337..164a0c8 100644 --- a/views/admin/ueber.phtml +++ b/views/admin/ueber.phtml @@ -117,6 +117,17 @@ <?php echo wpsg_drawForm_TextEnd(__('Sprachdatei', 'wpsg')); ?>
</div>
+ <?php $arData = array(); $this->callMods('systemcheck', array(&$arData)); ?>
+ <?php if (wpsg_isSizedArray($arData)) { ?>
+ <div class="wpsg_admin_ueber_check_wrap">
+ <?php foreach ($arData as $d) { ?>
+ <p class="wpsg_admin_ueber_check wpsg_admin_ueber_check_<?php echo $d[1]; ?> <?php echo array('bg-info', 'bg-warning', 'bg-danger')[$d[1] - 1]; ?>">
+ <?php echo $d[2]; ?>
+ </p>
+ <?php } ?>
+ </div>
+ <?php } ?>
+
<?php echo wpsg_drawForm_AdminboxEnd(); ?>
<?php } ?>
diff --git a/views/css/admin.css b/views/css/admin.css index 6293e90..524fea7 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -133,6 +133,11 @@ .wpsg_admin_content h3.panel-title { margin:0px; }
.wpsg_admin_submenu .list-group-item { padding:5px 10px; }
.list-group { margin-bottom:15px !important; }
+.wpsg_admin_ueber_check_wrap { padding-top:15px; }
+.wpsg_admin_ueber_check_wrap .wpsg_admin_ueber_check { padding:15px; }
+.wpsg_admin_ueber_check_wrap .wpsg_admin_ueber_check_1 { } /* Notice Meldungen */
+.wpsg_admin_ueber_check_wrap .wpsg_admin_ueber_check_2 { } /* Warnungen Meldungen */
+.wpsg_admin_ueber_check_wrap .wpsg_admin_ueber_check_3 { } /* Error Meldungen */
/* Produktverwaltung */
.wpsg_pic_col { width:50px; }
diff --git a/views/produkt/addedit_general.phtml b/views/produkt/addedit_general.phtml index 81d8510..6785b53 100644 --- a/views/produkt/addedit_general.phtml +++ b/views/produkt/addedit_general.phtml @@ -15,7 +15,7 @@ <?php if (isset($_REQUEST['wpsg_lang']) && $a['lang'] == $this->getDefaultLanguageCode()) { ?>
<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
<?php } else { ?>
- <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>&wpsg_lang=<?php echo $a['locale']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
+ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id=<?php echo $_REQUEST['edit_id']; ?>&wpsg_lang=<?php echo $a['lang']; ?>" title="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>">
<?php } ?>
<img src="<?php echo $this->getFlagURL().$a['flag']; ?>" alt="<?php echo wpsg_translate(__('Zu Sprache #1# wechseln.', 'wpsg'), $a['name']); ?>" />
</a>
@@ -48,7 +48,7 @@ ), wpsg_getStr($this->view['data']['basket_multiple']), array('help' => 'basket_multiple')); ?>
<?php } ?>
<?php if (wpsg_isSizedInt($this->view['data']['id'])) { ?>
- <?php echo wpsg_drawForm_TextStart(); $url = $this->getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['lang_parent']))?$this->view['data']['lang_parent']:$this->view['data']['id']))); ?>
+ <?php echo wpsg_drawForm_TextStart(); $url = $this->getProduktLink(array('id' => ((wpsg_isSizedInt($this->view['data']['id']))?$this->view['data']['id']:$this->view['data']['id']))); ?>
<a href="<?php echo $url; ?>"><?php echo wpsg_hspc($url); ?></a>
<?php echo wpsg_drawForm_TextEnd(__('URL', 'wpsg')); ?>
<?php } ?>
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index 7b08d4e..0d10c4c 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -135,7 +135,7 @@ <?php } ?>
<td class="post-title column-title">
<strong>
- <?php if ($this->isMultiLingual()) { ?>
+ <?php if ($this->isMultiLingual()) { ?>
<?php foreach ($this->getStoreLanguages() as $l) { ?>
<?php if ($l['locale'] != $this->getDefaultLanguageLocale()) { ?>
<a href="<?php echo $this->url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Produkt&action=edit&edit_id='.$d['id'].'&wpsg_lang='.$l['lang']); ?>" title="<?php echo wpsg_translate(__('Produkt für Sprache #1# bearbeiten.', 'wpsg'), $l['name']); ?>">
diff --git a/views/produkttemplates/standard.phtml b/views/produkttemplates/standard.phtml index 2a120ac..3243cbb 100644 --- a/views/produkttemplates/standard.phtml +++ b/views/produkttemplates/standard.phtml @@ -10,8 +10,6 @@ // Damit keine Zubehörprodukte ausgegeben werden
//$this->noReleatedProducts = true;
- //wpsg_debug($_SESSION);
-
if (!function_exists('is_plugin_active'))
require_once(ABSPATH.'/wp-admin/includes/plugin.php');
?>
@@ -334,8 +332,8 @@ if (!function_exists('is_plugin_active')) <?php /* Social Media Integration */ ?>
<div class="wpsg_product_social_media">
- <?php if ( is_plugin_active( 'plugin-directory/shariff.php' )) {?>
- <?=do_shortcode('[shariff]')?>
+ <?php if (is_plugin_active('plugin-directory/shariff.php')) {?>
+ <?php echo do_shortcode('[shariff]')?>
<?php } ?>
</div>
diff --git a/views/warenkorb/basket.phtml b/views/warenkorb/basket.phtml index f85cd1f..4c68672 100644 --- a/views/warenkorb/basket.phtml +++ b/views/warenkorb/basket.phtml @@ -7,8 +7,10 @@ //wpsg_debug($this->view['basket']);
//wpsg_debug($_SESSION);
//wpsg_debug($this->arShipping);
-
-?>
+
+ //wpsg_debug(__('Deutschland', 'wpsg'));
+
+?>
<div class="wpsg wpsg_basket <?php echo ((isset($_REQUEST['wpsg_basket_ajax']))?'wpsg_basket_ajax':''); ?>">
<?php if ($this->hasMod('wpsg_mod_onepagecheckout') && ($this->get_option('wpsg_mod_onepagecheckout_basket') == 1)) { ?>
|