| @@ -1,11 +1,14 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | namespace Tableberg\Admin; |
| 4 | 4 | |
| 5 | +// Needed so the qualified name `Tableberg\Assets` below resolves to the root | |
| 6 | +// namespace instead of `Tableberg\Admin\Tableberg\Assets`. | |
| 5 | 7 | use Tableberg; |
| 6 | 8 | |
| 7 | 9 | class Tableberg_Admin { |
| 10 | + private $plugin_name; | |
| 8 | 11 | private $plugin_url; |
| 9 | 12 | |
| 10 | 13 | public function __construct() { |
| 11 | 14 | |
| @@ -97,17 +100,19 @@ | ||
| 97 | 100 | ], |
| 98 | 101 | ], |
| 99 | 102 | ]; |
| 100 | 103 | |
| 104 | + $has_pro_addon = defined('TABLEBERG_PRO_VERSION'); | |
| 101 | 105 | global $tp_fs; |
| 102 | 106 | if (isset($tp_fs)) { |
| 103 | 107 | $data['misc'] = [ |
| 104 | - 'pro_status' => $tp_fs->is__premium_only() | |
| 105 | - && $tp_fs->can_use_premium_code(), | |
| 108 | + 'pro_status' => $has_pro_addon | |
| 109 | + || ($tp_fs->is__premium_only() | |
| 110 | + && $tp_fs->can_use_premium_code()), | |
| 106 | 111 | ]; |
| 107 | 112 | } else { |
| 108 | 113 | $data['misc'] = [ |
| 109 | - 'pro_status' => false, | |
| 114 | + 'pro_status' => $has_pro_addon, | |
| 110 | 115 | ]; |
| 111 | 116 | } |
| 112 | 117 | |
| 113 | 118 | $data = array_merge($data, $this->welcome_page()); |
| @@ -173,9 +178,9 @@ | ||
| 173 | 178 | $diff_interval = round(($datetime2->format('U') - $datetime1->format('U')) / (60 * 60 * 24)); |
| 174 | 179 | |
| 175 | 180 | if ($diff_interval >= 21 && get_option('tableberg_review_notify') == 'no') { |
| 176 | 181 | ?> |
| 177 | - <div class="tableberg-review-notice notice notice-info" style="display: inline-block; position: relative; padding:0.5rem 1.5rem"> | |
| 182 | + <div class="tableberg-review-notice notice notice-info" style="position: relative; padding:0.5rem 1.5rem"> | |
| 178 | 183 | <button type="button" class="notice-dismiss Tableberg_HideReview_Notice" style="position: absolute; top: 2px; right: 2px;"> |
| 179 | 184 | <span class="screen-reader-text"><?php esc_html_e('Dismiss this notice.', 'tableberg'); ?></span> |
| 180 | 185 | </button> |
| 181 | 186 | <p style="font-size: 14px; line-height: 2;padding-right:2rem"> |