From b8a6622d79c99688325955e9af25c2e17e802843 Mon Sep 17 00:00:00 2001 From: Daniel Schmitzer Date: Fri, 8 Sep 2017 09:03:43 +0000 Subject: - Lizenzverwaltung git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6484 0d5edaf7-2b12-4e95-93f4-047927463d4b --- views/admin/index.phtml | 4 +- views/admin/licence.phtml | 155 ++++++++++++++++++++++++++++++++++++---------- views/admin/module.phtml | 109 ++++++++++++++++++++++++++------ views/admin/news.phtml | 4 +- views/css/admin.css | 16 ++++- 5 files changed, 229 insertions(+), 59 deletions(-) diff --git a/views/admin/index.phtml b/views/admin/index.phtml index 9c5ea9b..dcebb2e 100644 --- a/views/admin/index.phtml +++ b/views/admin/index.phtml @@ -38,8 +38,8 @@ - writeBackendMessage(); ?> - +
+
view['subTemplate'])) { ?> render($this->view['subTemplate']); ?> diff --git a/views/admin/licence.phtml b/views/admin/licence.phtml index f5975ca..b4fbec5 100644 --- a/views/admin/licence.phtml +++ b/views/admin/licence.phtml @@ -4,6 +4,10 @@ * Template für die Lizenzverwaltung */ + $wpsg_update_data = wpsg_get_update_data(); + + if (!is_array($wpsg_update_data) || !current_user_can('wpsg_lizence')) die(); + ?>
@@ -18,7 +22,7 @@ - + @@ -38,7 +42,7 @@ writeBackendMessage(); ?> - +
@@ -68,15 +72,116 @@ view['subaction'] === 'registerdata') { ?> - +
+ + + + + + + +
+ + + + + + + + __('Deutschland', 'wpsg'), + '2' => __('Österreich', 'wpsg'), + '3' => __('Schweiz', 'wpsg'), + '4' => __('Niederlande', 'wpsg'), + '5' => __('Belgien', 'wpsg') + ), $wpsg_update_data['registerData']['country']); ?> + + +
+ + + +
view['subaction'] === 'domaindata') { ?> - + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +

+ + + +
+ + + +

+ +
+ + + + + +

+ + + +

+ + + view['subaction'] === 'modulactivation') { ?> shop->loadModule(true); ?> + +
+ +
+ +
+
+ + + +
+
+ + + +
+
+
+ +
+ +
+ @@ -86,7 +191,7 @@ - + @@ -111,9 +216,9 @@ - + - + @@ -138,9 +243,16 @@ else if (version_compare($modul_info['version'], $this->shop->arAllModule[$modul_key]->versio) > 0) { - echo ' - '.__('neue Version verfügbar', 'wpsg').'
'; - echo wpsg_translate(__('Version installieren.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key); - + echo ' - '.__('neue Version verfügbar', 'wpsg').''; + + if ($modul_info['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='.$modul_key); + + } + } ?> @@ -150,28 +262,7 @@ - -
- -
- - -
-
- - - -
-
- - - -
-
-
- -
- +
diff --git a/views/admin/module.phtml b/views/admin/module.phtml index 514918b..394ee7a 100644 --- a/views/admin/module.phtml +++ b/views/admin/module.phtml @@ -5,6 +5,12 @@ * Sollte nicht angepasst werden */ + $wpsg_update_data = wpsg_get_update_data(); + if (wpsg_isSizedArray($wpsg_update_data['modulinfo'])) $modul_info = $wpsg_update_data['modulinfo']; + else $modul_info = array(); + + //wpsg_debug($modul_info); + ?>
@@ -50,23 +56,79 @@ __('Nein', 'wpsg'), '1' => __('Ja', 'wpsg')), ((wpsg_isSizedInt($modul_install))?'1':'0')); ?> arAllModule[$_REQUEST['modul']]->version)) { ?> - arAllModule[$_REQUEST['modul']]->version, array('text' => true)); ?> + + - arAllModule[$_REQUEST['modul']]->free) && $this->arAllModule[$_REQUEST['modul']]->free === true) { ?> - - - arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) { ?> - - - arAllModule[$_REQUEST['modul']]->getDemoDays() > 0) { ?> - arAllModule[$_REQUEST['modul']]->getDemoDays()); ?> - - - - - - + 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) + { + + echo ' - '.__('aktuell', 'wpsg').''; + + } + else if (version_compare($modul_info_modul['version'], WPSG_VERSION) > 0) + { + + 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) + { + + 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']); + + } + + } + + } + + ?> + + + + + + + + + + + + + + + + [ ] + + [ ] + + [ ] + + + + + + + + +
+ arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) || $this->arAllModule[$_REQUEST['modul']]->getDemoDays() > 0))) { ?> @@ -140,7 +202,7 @@ - + @@ -175,9 +237,9 @@ - + - + @@ -202,8 +264,15 @@ else if (version_compare($modul_info['version'], $this->arAllModule[$modul_key]->versio) > 0) { - echo ' - '.__('neue Version verfügbar', 'wpsg').'
'; - echo wpsg_translate(__('Version installieren.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=registrierung&noheader=1&do=installModul&modul='.$modul_key); + echo ' - '.__('neue Version verfügbar', 'wpsg').''; + + if ($modul_info['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='.$modul_key); + + } } diff --git a/views/admin/news.phtml b/views/admin/news.phtml index ceb4d62..25fdcf9 100644 --- a/views/admin/news.phtml +++ b/views/admin/news.phtml @@ -7,9 +7,7 @@ ?> view['news'])) { ?> - -
- +
view['news'] as $news) { ?> diff --git a/views/css/admin.css b/views/css/admin.css index 7bdd8ff..87fe54c 100644 --- a/views/css/admin.css +++ b/views/css/admin.css @@ -41,7 +41,7 @@ #wpsg-bs .wpsg_error { color:red; } #wpsg-bs .form-group-sm .form-control { padding-left:8px; } #wpsg-bs .form-group-text { position:relative; } -#wpsg-bs .form-group-text p { padding-top:8px; line-height:100%; min-height:18px; } +#wpsg-bs .form-group-text p { padding-top:5px; line-height:150%; min-height:18px; } #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; } @@ -57,6 +57,8 @@ #wpsg-bs fieldset > legend > div { padding-left:25px; } #wpsg-bs .wpsg_table_wrap { max-width:100%; overflow-x:auto; margin-bottom:1rem; } #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; } /* Allgemeine Klassen */ .wpsg_grey { color:#999999; } @@ -194,7 +196,14 @@ .wpsg_modul_onlyactive { position:absolute; } .wpsg_modul_onlyactive_glyphicon { position:absolute !important; right:5px; top:7px !important; color:#3c763d; } .wpsg_modul_search_wrap input[type="checkbox"] { right:25px; top:3px; position:absolute; } -#wpsg-bs .modultable td { padding:4px 8px !important; } +#wpsg-bs .modultable td { padding:4px 8px !important; font-size:1.2rem; } +#wpsg-bs .modultable tr > *:nth-child(2) { width:100px; } +#wpsg-bs .modultable tr > *:nth-child(3) { width:175px; } +#wpsg-bs .modultable tr > *:nth-child(4) { width:200px; } + +/* Domainverwaltung */ +#wpsg-bs .domaintable td { padding:4px 8px !important; vertical-align:middle; } +#wpsg-bs .domaintable td.col_action { text-align:right; } /* Verwaltung Versandzonen */ .wpsg_table_vz .col_aktion { text-align:right; } @@ -321,6 +330,9 @@ .wpsg_ov_table .wpsg_pflicht { width:100px; text-align:center; } .wpsg_ov_table .wpsg_label { text-align:left; } +/* News Bereich Backend */ +.wpsg_news_wrap { margin-right:20px; } + /* Statistikmodul */ .wpsg_mod_statistics_totals_row { width:100%; } .wpsg_mod_statistics_totals_block { float:left; width:auto; text-align:center; font-family: Georgia,"Times New Roman","Bitstream Charter",Times,serif; } -- cgit v1.2.3