From a5abf7c77ba84a3c83a1361b6845eaa5d5047f9e Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Thu, 14 Sep 2017 14:17:07 +0000 Subject: - Demo Modus / Meldunstuning git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6503 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/index.phtml | 7 ++- views/admin/laender_list.phtml | 2 - views/admin/licence.phtml | 6 +- views/admin/module.phtml | 64 ++++++++++++++-------- views/css/admin.css | 3 + views/mods/mod_customergroup/addedit.phtml | 2 - views/mods/mod_customergroup/index.phtml | 2 - views/mods/mod_export/profil.phtml | 2 - views/mods/mod_gutschein/add.phtml | 2 - views/mods/mod_gutschein/import.phtml | 1 - views/mods/mod_gutschein/index.phtml | 2 - views/mods/mod_kundenverwaltung/edit.phtml | 2 - views/mods/mod_kundenverwaltung/import.phtml | 1 - views/mods/mod_kundenverwaltung/index.phtml | 2 - views/mods/mod_productgroups/add.phtml | 2 - views/mods/mod_productgroups/index.phtml | 2 - .../order_view_sidebar_content.phtml | 1 - views/order/index.phtml | 4 +- views/order/view.phtml | 4 +- views/produkt/addedit.phtml | 6 +- views/produkt/import.phtml | 3 - views/produkt/index.phtml | 6 +- views/produkt/mapimport.phtml | 3 - 23 files changed, 60 insertions(+), 69 deletions(-) (limited to 'views') 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 @@ - - writeBackendMessage(); ?> - +
+ +
+ view['subTemplate'])) { ?> render($this->view['subTemplate']); ?> 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 @@ ?> -writeBackendMessage(true); ?> - view['data'])) { ?> 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 @@ - - writeBackendMessage(); ?> - +
+ +
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 @@

arAllModule[$_REQUEST['modul']]->desc; ?>


- get_option($_REQUEST['modul'], $this->view['global']); ?> - __('Nein', 'wpsg'), '1' => __('Ja', 'wpsg')), ((wpsg_isSizedInt($modul_install))?'1':'0')); ?> + + + get_option($_REQUEST['modul'], $this->view['global']); ?> + __('Nein', 'wpsg'), '1' => __('Ja', 'wpsg')), ((wpsg_isSizedInt($modul_install))?'1':'0')); ?> + + arAllModule[$_REQUEST['modul']]->version)) { ?> 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 ' - '.__('aktuell', 'wpsg').''; @@ -80,18 +84,13 @@ echo ' - '.__('neue Version verfügbar', 'wpsg').'
'.wpsg_translate(__('wpShopGermany Update 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 ' - '.__('neue Version verfügbar', 'wpsg').''; - if ($modul_info_modul['active'] === true) - { - - echo '
'; - echo wpsg_translate(__('Version installieren.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$_REQUEST['modul']); - - } + echo '
'; + echo wpsg_translate(__('Version installieren.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$_REQUEST['modul']); } @@ -110,7 +109,12 @@ - + + + + + + [ ] @@ -119,6 +123,12 @@ [ ] + +
+ + [ ] + + @@ -126,12 +136,13 @@ - -
- + - arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || 1))) { ?> + 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)) { ?> + +
+ arAllModule[$_REQUEST['modul']]->inline === true) { ?>

@@ -149,8 +160,13 @@ arAllModule[$_REQUEST['modul']]->inline !== true) { ?>

+ -

+ + +

+ + arAllModule[$_REQUEST['modul']]->inline !== true) { ?> @@ -285,7 +301,7 @@

- Lizenz aktivieren +

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 @@
- writeBackendMessage(); ?> -
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 @@
- writeBackendMessage(); ?> -
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 @@ ?> -writeBackendMessage(); ?> -
    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 @@
    - writeBackendMessage(); ?> -
    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 @@ */ ?> -writeBackendMessage(); ?>

    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 @@ - writeBackendMessage(); ?> -
    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 @@
    - writeBackendMessage(); ?> -
    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 @@ - writeBackendMessage(); ?>
    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 @@
    - writeBackendMessage(); ?> -
    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 @@
    - writeBackendMessage(); ?> -
    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 @@
    - writeBackendMessage(); ?> -
    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 @@ */ ?> -writeBackendMessage(); ?> view['wpsg_mod_voucherproduct']['data'])) { ?>
    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 @@ + +
    @@ -116,8 +118,6 @@
    - writeBackendMessage(); ?> -
    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 @@
    - - writeBackendMessage(); ?> + +
    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 @@
    - - writeBackendMessage(); ?> - + +
    +
    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 @@
    - writeBackendMessage(); ?> -
    -
    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 @@ callMod('wpsg_mod_export', 'product_index_tab'); ?> - - writeBackendMessage(); ?> -
    +
    +
    + hasMod('wpsg_mod_productgroups')) { $arProductgroupSelect = wpsg_productgroup::getProductgroupSelect($this->view['arFilter']); ?>
    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 @@ - writeBackendMessage(); ?> -
    - -- cgit v1.2.3