diff options
| author | Daniel Schmitzer <noreply@maennchen1.de> | 2017-09-14 14:17:07 +0000 |
|---|---|---|
| committer | Daniel Schmitzer <noreply@maennchen1.de> | 2017-09-14 14:17:07 +0000 |
| commit | a5abf7c77ba84a3c83a1361b6845eaa5d5047f9e (patch) | |
| tree | f6ab2ec0b30d5d0669ec7cb9cbc1e6d91a855369 | |
| parent | 1e295fa48362d169a14830f7bad23a8037c35b7b (diff) | |
- Demo Modus / Meldunstuning
git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6503 0d5edaf7-2b12-4e95-93f4-047927463d4b
23 files changed, 60 insertions, 69 deletions
diff --git a/views/admin/index.phtml b/views/admin/index.phtml index 8926d14..fc0ecb9 100644 --- a/views/admin/index.phtml +++ b/views/admin/index.phtml @@ -39,10 +39,11 @@ </div>
</div>
</nav>
-
- <?php echo $this->writeBackendMessage(); ?>
-
+
<div class="wpsg_admin_wrap">
+
+ <div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"/></div>
+
<?php if (wpsg_isSizedString($this->view['subTemplate'])) { ?>
<?php $this->render($this->view['subTemplate']); ?>
<?php } ?>
diff --git a/views/admin/laender_list.phtml b/views/admin/laender_list.phtml index dd0e8fb..09a1b07 100644 --- a/views/admin/laender_list.phtml +++ b/views/admin/laender_list.phtml @@ -4,8 +4,6 @@ ?> -<?php echo $this->writeBackendMessage(true); ?> - <?php if (wpsg_isSizedArray($this->view['data'])) { ?> <table class="table wpsg_table_country"> diff --git a/views/admin/licence.phtml b/views/admin/licence.phtml index 2577736..e62d772 100644 --- a/views/admin/licence.phtml +++ b/views/admin/licence.phtml @@ -40,10 +40,10 @@ </div>
</div>
</nav>
-
- <?php echo $this->writeBackendMessage(); ?>
-
+
<div class="wpsg_admin_wrap">
+
+ <div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"/></div>
<div class="wpsg_admin_submenu">
diff --git a/views/admin/module.phtml b/views/admin/module.phtml index 2564940..4cc4c6a 100644 --- a/views/admin/module.phtml +++ b/views/admin/module.phtml @@ -44,31 +44,35 @@ <form name="form1" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=<?php echo $_REQUEST['modul']; ?>&noheader=1" method="post" enctype="multipart/form-data">
<!-- <h3>
- <?php echo $this->arAllModule[$_REQUEST['modul']]->name; ?>
- <?php if (isset($this->arAllModule[$_REQUEST['modul']]->hilfeURL) && $this->arAllModule[$_REQUEST['modul']]->hilfeURL != '') { ?>
- <a target="_blank" href="<?php echo $this->arAllModule[$_REQUEST['modul']]->hilfeURL; ?>" class="wpsg_form_help_notip"></a>
- <?php } ?>
+ <?php echo $this->arAllModule[$_REQUEST['modul']]->name; ?>
+ <?php if (isset($this->arAllModule[$_REQUEST['modul']]->hilfeURL) && $this->arAllModule[$_REQUEST['modul']]->hilfeURL != '') { ?>
+ <a target="_blank" href="<?php echo $this->arAllModule[$_REQUEST['modul']]->hilfeURL; ?>" class="wpsg_form_help_notip"></a>
+ <?php } ?>
</h3> -->
<p><?php echo $this->arAllModule[$_REQUEST['modul']]->desc; ?></p><br />
- <?php $modul_install = $this->get_option($_REQUEST['modul'], $this->view['global']); ?>
- <?php echo wpsg_drawForm_Select('aktiv', __('Modul aktiviert', 'wpsg'), array('0' => __('Nein', 'wpsg'), '1' => __('Ja', 'wpsg')), ((wpsg_isSizedInt($modul_install))?'1':'0')); ?>
+ <?php if (@$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['demo_active'] === true || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['active'] === true || $wpsg_update_data['modulinfo'][$_REQUEST['modul']]['free'] === true) { ?>
+
+ <?php $modul_install = $this->get_option($_REQUEST['modul'], $this->view['global']); ?>
+ <?php echo wpsg_drawForm_Select('aktiv', __('Modul aktiviert', 'wpsg'), array('0' => __('Nein', 'wpsg'), '1' => __('Ja', 'wpsg')), ((wpsg_isSizedInt($modul_install))?'1':'0')); ?>
+
+ <?php } ?>
<?php if (isset($this->arAllModule[$_REQUEST['modul']]->version)) { ?>
<?php echo wpsg_drawForm_TextStart(); ?>
<?php
-
+
echo $this->arAllModule[$_REQUEST['modul']]->version;
if (wpsg_isSizedArray($modul_info[$_REQUEST['modul']]))
{
$modul_info_modul = $modul_info[$_REQUEST['modul']];
-
- if ($modul_info_modul['version'] === $this->shop->arAllModule[$_REQUEST['modul']]->version)
+
+ if ($modul_info_modul['version'] === $this->arAllModule[$_REQUEST['modul']]->version)
{
echo ' - <strong class="wpsg_message_ok">'.__('aktuell', 'wpsg').'</strong>';
@@ -80,18 +84,13 @@ echo ' - <strong class="wpsg_error">'.__('neue Version verfügbar', 'wpsg').'</strong><br />'.wpsg_translate(__('<a href="#1#">wpShopGermany Update</a> notwendig', 'wpsg'), WPSG_URL_WP.'wp-admin/plugins.php');
}
- else if (version_compare($modul_info_modul['version'], $this->shop->arAllModule[$_REQUEST['modul']]->versio) > 0)
+ else if (version_compare($modul_info_modul['version'], $this->arAllModule[$_REQUEST['modul']]->versio) > 0)
{
echo ' - <strong class="wpsg_error">'.__('neue Version verfügbar', 'wpsg').'</strong>';
- if ($modul_info_modul['active'] === true)
- {
-
- echo '<br />';
- echo wpsg_translate(__('<a href="#1#">Version installieren</a>.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$_REQUEST['modul']);
-
- }
+ echo '<br />';
+ echo wpsg_translate(__('<a href="#1#">Version installieren</a>.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$_REQUEST['modul']);
}
@@ -110,7 +109,12 @@ <?php } else if (wpsg_isTrue($modul_info[$_REQUEST['modul']]['active'])) { ?>
<span class="wpsg_message_ok"><?php echo __('Aktiv', 'wpsg'); ?></span>
<?php } else { ?>
- <span class="wpsg_error"><?php echo __('Nicht aktiv', 'wpsg'); ?></span>
+
+ <?php if (wpsg_isTrue($modul_info[$_REQUEST['modul']]['demo_active'])) { ?>
+ <span class="wpsg_message_demo"><?php echo __('Demo Modus', 'wpsg'); ?></span>
+ <?php } else { ?>
+ <span class="wpsg_error"><?php echo __('Nicht aktiv', 'wpsg'); ?></span>
+ <?php } ?>
<?php if (wpsg_isSizedString($modul_info[$_REQUEST['modul']]['shop_url'])) { ?>
[ <a href="<?php echo $modul_info[$_REQUEST['modul']]['shop_url']; ?>"><?php echo __('Modulcode erwerben', 'wpsg'); ?></a> ]
@@ -119,6 +123,12 @@ <?php } ?>
[ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&subaction=modulactivation"><?php echo __('Modulcode eingeben', 'wpsg'); ?></a> ]
+ <?php if (!wpsg_isTrue($modul_info[$_REQUEST['modul']]['demo_active'])) { ?>
+ <br />
+
+ [ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=startDemo&modul=<?php echo $_REQUEST['modul']; ?>" onclick="return confirm('<?php echo __('Sind Sie sich sicher? Das Modul kann 14 Tage ab heute komplett in vollem Umfang getestet werden.', 'wpsg'); ?>');"><?php echo __('Demo Modus starten'); ?></a> ]
+ <?php } ?>
+
<?php } ?>
<?php } else { ?>
@@ -126,12 +136,13 @@ <?php } ?>
<?php echo wpsg_drawForm_TextEnd(__('Lizenz')); ?>
-
- <hr />
-
+
<?php } ?>
- <?php if (!isset($this->arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || 1))) { ?>
+ <?php if (!isset($this->arAllModule[$_REQUEST['modul']]->version) || (@$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['demo_active'] === true || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['active'] === true || $wpsg_update_data['modulinfo'][$_REQUEST['modul']]['free'] === true)) { ?>
+
+ <hr />
+
<?php if ($this->arAllModule[$_REQUEST['modul']]->inline === true) { ?>
<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>
<?php } ?>
@@ -149,8 +160,13 @@ <?php if ($this->arAllModule[$_REQUEST['modul']]->inline !== true) { ?>
<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>
<?php } ?>
+
<?php } else { ?>
- <p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>
+
+ <?php if (@$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['demo_active'] === true || @$wpsg_update_data['modulinfo'][$_REQUEST['modul']]['active'] === true || $wpsg_update_data['modulinfo'][$_REQUEST['modul']]['free'] === true) { ?>
+ <p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>
+ <?php } ?>
+
<?php } ?>
<?php if ($this->arAllModule[$_REQUEST['modul']]->inline !== true) { ?>
@@ -285,7 +301,7 @@ <?php } else { ?>
<p>
- Lizenz aktivieren
+ <?php echo __('Bitte erwerben Sie eine Lizenz für wpShopGermany, damit sie unsere Erweiterungsmodule nutzen können.', 'wpsg'); ?>
</p>
<?php } ?>
diff --git a/views/css/admin.css b/views/css/admin.css index 5e7d80e..447e6e7 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -38,6 +38,7 @@ #wpsg-bs .wpsg-glyphlink-td > span { margin-left:5px; margin-top:5px; }
#wpsg-bs .wpsg-glyphlink-td:hover { text-decoration:none; }
#wpsg-bs .wpsg_message_ok { color:green; }
+#wpsg-bs .wpsg_message_demo { color:blue; }
#wpsg-bs .wpsg_error { color:red; }
#wpsg-bs .form-group-sm .form-control { padding-left:8px; }
#wpsg-bs .form-group-text { position:relative; }
@@ -59,6 +60,8 @@ #wpsg-bs .wpsg-bs-toggle-nav { float:right; line-height:50px; font-size:25px; text-decoration:none; }
#wspg-bs #message,
#wpsg-bs .wpsg_banner { margin-right:20px; }
+#wpsg-bs .wpsg-wp-header-end { margin-top:-10px !important; }
+#wpsg-bs .wpsg_msg_wrap { margin-right:20px; }
/* Allgemeine Klassen */
.wpsg_grey { color:#999999; }
diff --git a/views/mods/mod_customergroup/addedit.phtml b/views/mods/mod_customergroup/addedit.phtml index 275b571..e1fa844 100644 --- a/views/mods/mod_customergroup/addedit.phtml +++ b/views/mods/mod_customergroup/addedit.phtml @@ -28,8 +28,6 @@ <div class="wpsg_clear"></div>
- <?php echo $this->writeBackendMessage(); ?>
-
<div class="content form-horizontal">
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customergroup&action=save&noheader=1" enctype="multipart/form-data">
diff --git a/views/mods/mod_customergroup/index.phtml b/views/mods/mod_customergroup/index.phtml index 2fe5306..71ffcf8 100644 --- a/views/mods/mod_customergroup/index.phtml +++ b/views/mods/mod_customergroup/index.phtml @@ -65,8 +65,6 @@ <div class="wpsg_clear"></div>
- <?php echo $this->writeBackendMessage(); ?>
-
<div class="content">
<?php if (is_array($this->view['arData']) && sizeof($this->view['arData']) > 0) { ?>
diff --git a/views/mods/mod_export/profil.phtml b/views/mods/mod_export/profil.phtml index d3cef88..2e3a924 100644 --- a/views/mods/mod_export/profil.phtml +++ b/views/mods/mod_export/profil.phtml @@ -10,8 +10,6 @@ ?>
-<?php echo $this->writeBackendMessage(); ?>
-
<div id="wpsg_mod_export_profil_tab">
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Profiloptionen', 'wpsg'); ?></a></li>
diff --git a/views/mods/mod_gutschein/add.phtml b/views/mods/mod_gutschein/add.phtml index 8328214..e7a3580 100644 --- a/views/mods/mod_gutschein/add.phtml +++ b/views/mods/mod_gutschein/add.phtml @@ -29,8 +29,6 @@ <div class="wpsg_clear"></div>
- <?php echo $this->writeBackendMessage(); ?>
-
<div class="content form-horizontal">
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Voucher&action=save&noheader=1" enctype="multipart/form-data">
diff --git a/views/mods/mod_gutschein/import.phtml b/views/mods/mod_gutschein/import.phtml index 520f4d0..d8e6d80 100644 --- a/views/mods/mod_gutschein/import.phtml +++ b/views/mods/mod_gutschein/import.phtml @@ -5,7 +5,6 @@ */
?>
-<?php echo $this->writeBackendMessage(); ?>
<div class="wrap wpsg_mod_gutschein">
<div class="icon32 icon32-posts-post" id="icon-edit"><br></div>
diff --git a/views/mods/mod_gutschein/index.phtml b/views/mods/mod_gutschein/index.phtml index e311152..22826c0 100644 --- a/views/mods/mod_gutschein/index.phtml +++ b/views/mods/mod_gutschein/index.phtml @@ -49,8 +49,6 @@ </nav>
- <?php echo $this->writeBackendMessage(); ?>
-
<div class="wpsg_clear"></div>
<?php $this->render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>
diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml index e95f95e..4cf52a3 100644 --- a/views/mods/mod_kundenverwaltung/edit.phtml +++ b/views/mods/mod_kundenverwaltung/edit.phtml @@ -31,8 +31,6 @@ <div class="wpsg_clear"></div>
- <?php echo $this->writeBackendMessage(); ?>
-
<div class="content form-horizontal">
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=save&noheader=1" enctype="multipart/form-data">
diff --git a/views/mods/mod_kundenverwaltung/import.phtml b/views/mods/mod_kundenverwaltung/import.phtml index d8b898b..8adc2d8 100644 --- a/views/mods/mod_kundenverwaltung/import.phtml +++ b/views/mods/mod_kundenverwaltung/import.phtml @@ -12,7 +12,6 @@ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=index" class="add-new-h2"><?php echo __("Zurück zur Kundenverwaltung", "wpsg"); ?></a>
</h2>
- <?php echo $this->writeBackendMessage(); ?>
<br />
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=import&noheader=1" id="import_form" enctype="multipart/form-data">
diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml index a2e1b1a..37c11c5 100644 --- a/views/mods/mod_kundenverwaltung/index.phtml +++ b/views/mods/mod_kundenverwaltung/index.phtml @@ -112,8 +112,6 @@ <div class="wpsg_clear"></div>
- <?php echo $this->writeBackendMessage(); ?>
-
<div class="content">
<?php if (is_array($this->view['arData']) && sizeof($this->view['arData']) > 0) { ?>
diff --git a/views/mods/mod_productgroups/add.phtml b/views/mods/mod_productgroups/add.phtml index de8f857..b0dddf7 100644 --- a/views/mods/mod_productgroups/add.phtml +++ b/views/mods/mod_productgroups/add.phtml @@ -28,8 +28,6 @@ <div class="wpsg_clear"></div>
- <?php echo $this->writeBackendMessage(); ?>
-
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Productgroups&wpsg_mod_action=save&noheader=1" enctype="multipart/form-data">
<div class="content form-horizontal">
diff --git a/views/mods/mod_productgroups/index.phtml b/views/mods/mod_productgroups/index.phtml index 550ff0a..826c9b3 100644 --- a/views/mods/mod_productgroups/index.phtml +++ b/views/mods/mod_productgroups/index.phtml @@ -64,8 +64,6 @@ <div class="wpsg_clear"></div>
- <?php echo $this->writeBackendMessage(); ?>
-
<div class="content">
<?php if (is_array($this->view['arData']) && sizeof($this->view['arData']) > 0) { ?>
diff --git a/views/mods/mod_voucherproduct/order_view_sidebar_content.phtml b/views/mods/mod_voucherproduct/order_view_sidebar_content.phtml index 69ab3a2..b1bf335 100644 --- a/views/mods/mod_voucherproduct/order_view_sidebar_content.phtml +++ b/views/mods/mod_voucherproduct/order_view_sidebar_content.phtml @@ -5,7 +5,6 @@ */
?>
-<?php echo $this->writeBackendMessage(); ?>
<?php if (wpsg_isSizedArray($this->view['wpsg_mod_voucherproduct']['data'])) { ?>
<div class="wpsg_mod_voucherproduct_list">
diff --git a/views/order/index.phtml b/views/order/index.phtml index 941709b..042590e 100644 --- a/views/order/index.phtml +++ b/views/order/index.phtml @@ -101,6 +101,8 @@ <?php } ?>
</nav>
+
+ <div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"/></div>
<div class="pagination_wrap wpsg_status_link_wrap">
@@ -116,8 +118,6 @@ <div class="wpsg_clear"></div>
- <?php echo $this->writeBackendMessage(); ?>
-
<div class="content">
<form method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&noheader=1" enctype="multipart/form-data">
diff --git a/views/order/view.phtml b/views/order/view.phtml index 4ede53a..f660eb9 100644 --- a/views/order/view.phtml +++ b/views/order/view.phtml @@ -24,8 +24,8 @@ </div>
</nav>
-
- <?php echo $this->writeBackendMessage(); ?>
+
+ <div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"/></div>
<div class="wpsg_admin_submenu">
diff --git a/views/produkt/addedit.phtml b/views/produkt/addedit.phtml index aecb281..6830b8c 100644 --- a/views/produkt/addedit.phtml +++ b/views/produkt/addedit.phtml @@ -22,9 +22,9 @@ </div>
</div>
</nav>
-
- <?php echo $this->writeBackendMessage(); ?>
-
+
+ <div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"/></div>
+
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=save&noheader=1" enctype="multipart/form-data">
<div class="wpsg_admin_submenu">
diff --git a/views/produkt/import.phtml b/views/produkt/import.phtml index a0bc4dd..0435333 100644 --- a/views/produkt/import.phtml +++ b/views/produkt/import.phtml @@ -27,9 +27,6 @@ <div class="row">
<div class="col-lg-4">
- <?php echo $this->writeBackendMessage(); ?>
- <br />
-
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=import&noheader=1" id="import_form" enctype="multipart/form-data">
<div class="wpsg_hinweis"><?php echo __('Laden Sie ein vorher exportiertes CSV File hoch, die Produktdaten werden dann aus dieser Datei importiert.', 'wpsg'); ?></div>
diff --git a/views/produkt/index.phtml b/views/produkt/index.phtml index b671c5f..54725cb 100644 --- a/views/produkt/index.phtml +++ b/views/produkt/index.phtml @@ -84,11 +84,11 @@ <?php echo $this->callMod('wpsg_mod_export', 'product_index_tab'); ?>
</nav>
-
- <?php echo $this->writeBackendMessage(); ?>
- <div class="flex flex-100">
+ <div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"/></div>
+ <div class="flex flex-100">
+
<?php if ($this->hasMod('wpsg_mod_productgroups')) { $arProductgroupSelect = wpsg_productgroup::getProductgroupSelect($this->view['arFilter']); ?>
<?php if (wpsg_isSizedArray($arProductgroupSelect)) { ?>
<div class="pagination_wrap wpsg_productgroup_link_wrap">
diff --git a/views/produkt/mapimport.phtml b/views/produkt/mapimport.phtml index 31326b7..bd8c8bd 100644 --- a/views/produkt/mapimport.phtml +++ b/views/produkt/mapimport.phtml @@ -12,9 +12,6 @@ <a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=index" class="button add-new-h2"><?php echo __("Zurück zur Produktverwaltung", "wpsg"); ?></a>
</h2>
- <?php echo $this->writeBackendMessage(); ?>
- <br />
-
<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Produkt&action=import&" id="import_form" enctype="multipart/form-data">
|