AMP for WP – Accelerated Mobile Pages - Version 0.9.85.3

Version Description

(12th April 2018) = * Added: Custom Post type Archive Page support #1995 * Fixed: AMP TakeOver redirection issues #1994 * Fixed: Debug errors #1976 * Fixed: Social Profile pages were hidden for Design 1 to 3 #1996 * Fixed: Structured Data insertion was adding CData causing validation error #1999

Download this release

Release Info

Developer mohammed_kaludi
Plugin Icon 128x128 AMP for WP – Accelerated Mobile Pages
Version 0.9.85.3
Comparing to
See all releases

Code changes from version 0.9.85.2 to 0.9.85.3

Files changed (11) hide show
  1. README.md +15 -2
  2. accelerated-moblie-pages.php +29 -16
  3. components/comments/comments.php +1 -1
  4. includes/options/admin-config.php +4 -18
  5. includes/redirect.php +51 -7
  6. includes/updater/update.php +1 -1
  7. includes/vendor/amp/includes/sanitizers/class-amp-blacklist-sanitizer.php +1 -0
  8. readme.txt +15 -2
  9. templates/design-manager.php +1 -1
  10. templates/design-manager/swift/style.php +20 -20
  11. templates/features.php +2 -2
README.md CHANGED
@@ -3,8 +3,8 @@ Contributors: mohammed_kaludi, ahmedkaludi, ampforwp
3
  Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, google, plugin, SEO
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
- Tested up to: 4.9.4
7
- Stable tag: 0.9.85.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -178,6 +178,19 @@ You can contact us from [here](http://ampforwp.com/contact/)
178
 
179
  == Changelog ==
180
 
 
 
 
 
 
 
 
 
 
 
 
 
 
181
  = 0.9.85 (3rd April 2018) =
182
  * For more detials check out [this blog post](https://ampforwp.com/0-9-85-released-stability-update-86th-update/)
183
  * Fixed: Fatal error: Allowed memory size on FrontPage #1865
3
  Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, google, plugin, SEO
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
+ Tested up to: 4.9.5
7
+ Stable tag: 0.9.85.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
178
 
179
  == Changelog ==
180
 
181
+ = 0.9.85.3 (12th April 2018) =
182
+ * Added: Custom Post type Archive Page support #1995
183
+ * Fixed: AMP TakeOver redirection issues #1994
184
+ * Fixed: Debug errors #1976
185
+ * Fixed: Social Profile pages were hidden for Design 1 to 3 #1996
186
+ * Fixed: Structured Data insertion was adding CData causing validation error #1999
187
+
188
+ = 0.9.85.2 =
189
+ * Minor Bugs fixed
190
+
191
+ = 0.9.85.1 =
192
+ * Minor Bugs fixed
193
+
194
  = 0.9.85 (3rd April 2018) =
195
  * For more detials check out [this blog post](https://ampforwp.com/0-9-85-released-stability-update-86th-update/)
196
  * Fixed: Fatal error: Allowed memory size on FrontPage #1865
accelerated-moblie-pages.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Accelerated Mobile Pages
4
  Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5
  Description: AMP for WP - Accelerated Mobile Pages for WordPress
6
- Version: 0.9.85.2
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: https://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/25
@@ -19,7 +19,7 @@ define('AMPFORWP_PLUGIN_DIR_URI', plugin_dir_url(__FILE__));
19
  define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
20
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
21
  define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
22
- define('AMPFORWP_VERSION','0.9.85.2');
23
 
24
  // any changes to AMP_QUERY_VAR should be refelected here
25
  function ampforwp_generate_endpoint(){
@@ -188,23 +188,36 @@ function ampforwp_add_custom_rewrite_rules() {
188
  $output = 'names'; // or objects
189
  $operator = 'and'; // 'and' or 'or'
190
  $taxonomies = get_taxonomies( $args, $output, $operator );
 
 
 
 
 
 
 
 
 
 
 
191
  if ( $taxonomies ) {
192
- foreach ( $taxonomies as $taxonomy ) {
193
- add_rewrite_rule(
194
- $taxonomy.'\/(.+?)\/amp/?$',
195
- 'index.php?amp&'.$taxonomy.'=$matches[1]',
196
- 'top'
197
- );
198
- // For Custom Taxonomies with pages
199
- add_rewrite_rule(
200
- $taxonomy.'\/(.+?)\/amp\/page\/?([0-9]{1,})\/?$',
201
- 'index.php?amp&'.$taxonomy.'=$matches[1]&paged=$matches[2]',
202
- 'top'
203
- );
204
- }
 
 
205
  }
206
  }
207
- add_action( 'init', 'ampforwp_add_custom_rewrite_rules' );
208
 
209
  register_activation_hook( __FILE__, 'ampforwp_rewrite_activation', 20 );
210
  function ampforwp_rewrite_activation() {
3
  Plugin Name: Accelerated Mobile Pages
4
  Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5
  Description: AMP for WP - Accelerated Mobile Pages for WordPress
6
+ Version: 0.9.85.3
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: https://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/25
19
  define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
20
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
21
  define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
22
+ define('AMPFORWP_VERSION','0.9.85.3');
23
 
24
  // any changes to AMP_QUERY_VAR should be refelected here
25
  function ampforwp_generate_endpoint(){
188
  $output = 'names'; // or objects
189
  $operator = 'and'; // 'and' or 'or'
190
  $taxonomies = get_taxonomies( $args, $output, $operator );
191
+
192
+
193
+ if( class_exists( 'WooCommerce' ) ) {
194
+ $wc_permalinks = get_option( 'woocommerce_permalinks' );
195
+
196
+ if ( $wc_permalinks ) {
197
+ $taxonomies = array_merge($taxonomies, $wc_permalinks);
198
+ }
199
+ }
200
+
201
+ $taxonomies = apply_filters( 'ampforwp_modify_rewrite_tax', $taxonomies );
202
  if ( $taxonomies ) {
203
+ foreach ( $taxonomies as $key => $taxonomy ) {
204
+ if ( ! empty( $taxonomy ) ) {
205
+ add_rewrite_rule(
206
+ $taxonomy.'\/(.+?)\/amp/?$',
207
+ 'index.php?amp&'.$key.'=$matches[1]',
208
+ 'top'
209
+ );
210
+ // For Custom Taxonomies with pages
211
+ add_rewrite_rule(
212
+ $taxonomy.'\/(.+?)\/amp\/page\/?([0-9]{1,})\/?$',
213
+ 'index.php?amp&'.$taxonomy.'=$matches[1]&paged=$matches[2]',
214
+ 'top'
215
+ );
216
+ }
217
+ }
218
  }
219
  }
220
+ add_action( 'admin_init', 'ampforwp_add_custom_rewrite_rules' );
221
 
222
  register_activation_hook( __FILE__, 'ampforwp_rewrite_activation', 20 );
223
  function ampforwp_rewrite_activation() {
components/comments/comments.php CHANGED
@@ -10,7 +10,7 @@ if ( $redux_builder_amp['ampforwp-facebook-comments-support'] ) {
10
  if ( $redux_builder_amp['ampforwp-disqus-comments-support'] ) {
11
  ampforwp_framework_get_disqus_comments();
12
  }
13
- if ( comments_open() && true == $redux_builder_amp['wordpress-comments-support'] ) { ?>
14
  <div class="amp-comments">
15
  <?php
16
  global $redux_builder_amp;
10
  if ( $redux_builder_amp['ampforwp-disqus-comments-support'] ) {
11
  ampforwp_framework_get_disqus_comments();
12
  }
13
+ if ( isset($redux_builder_amp['wordpress-comments-support']) && comments_open() && true == $redux_builder_amp['wordpress-comments-support'] ) { ?>
14
  <div class="amp-comments">
15
  <?php
16
  global $redux_builder_amp;
includes/options/admin-config.php CHANGED
@@ -47,8 +47,8 @@ $extension_listing_array = array(
47
  'price'=>'$29',
48
  'url_link'=>'http://ampforwp.com/advanced-amp-ads/#utm_source=options-panel&utm_medium=extension-tab_advanced-amp-ads&utm_campaign=AMP%20Plugin',
49
  'plugin_active_path'=> 'amp-ads-google-adsense/amptoolkit-incontent-ads.php',
50
- 'item_name'=>'advanced-amp-ads',
51
- 'store_url'=>'',
52
  'is_activated'=>(is_plugin_active('amp-ads-google-adsense/amptoolkit-incontent-ads.php')? 1:2),
53
  ),
54
  array(
@@ -102,7 +102,7 @@ $extension_listing_array = array(
102
  'price'=>'$29',
103
  'url_link'=>'http://ampforwp.com/call-to-action/#utm_source=options-panel&utm_medium=extension-tab_amp-cta&utm_campaign=AMP%20Plugin',
104
  'plugin_active_path'=> 'AMP-cta/amp-cta.php',
105
- 'item_name'=>'Call To Action (CTA)',
106
  'store_url'=>'',
107
  'is_activated'=>(is_plugin_active('AMP-cta/amp-cta.php')? 1 : 2),
108
  ),
@@ -113,7 +113,7 @@ $extension_listing_array = array(
113
  'price'=>'$79',
114
  'url_link'=>'https://ampforwp.com/woocommerce/',
115
  'plugin_active_path'=> 'amp-woocommerce-pro/amp-woocommerce.php',
116
- 'item_name'=>'AMP WooCommerce Pro',
117
  'store_url'=>'',
118
  'is_activated'=>(is_plugin_active('amp-woocommerce-pro/amp-woocommerce.php')? 1 : 2),
119
  ),
@@ -139,17 +139,6 @@ $extension_listing_array = array(
139
  'item_name'=>'Star Ratings',
140
  'store_url'=>'',
141
  'is_activated'=>(is_plugin_active('amp-rating/amp-rating.php')? 1 : 2),
142
- ),
143
- array(
144
- 'name'=>'Category Base Removal',
145
- 'desc'=>'Remove Category Base Support in AMP',
146
- 'img_src'=>AMPFORWP_IMAGE_DIR . '/puzzel.png',
147
- 'price'=>'FREE',
148
- 'url_link'=>'http://ampforwp.com/amp-category-base-remove-support/#utm_source=options-panel&utm_medium=extension-tab_amp-category-base-remove-support&utm_campaign=AMP%20Plugin',
149
- 'plugin_active_path'=> '',
150
- 'item_name'=>'Category Base Removal',
151
- 'store_url'=>'',
152
- 'is_activated'=>2,
153
  ),
154
  array(
155
  'name'=>'Custom Post Type',
@@ -4661,9 +4650,6 @@ Redux::setSection( $opt_name, array(
4661
  'indent' => true,
4662
  //'start' => true,
4663
  //'label' => 'Tab 2',
4664
- 'required' => array(
4665
- array('amp-design-selector', '=' , '4')
4666
- ),
4667
  ),
4668
  array(
4669
  'id' => 'menu-social',
47
  'price'=>'$29',
48
  'url_link'=>'http://ampforwp.com/advanced-amp-ads/#utm_source=options-panel&utm_medium=extension-tab_advanced-amp-ads&utm_campaign=AMP%20Plugin',
49
  'plugin_active_path'=> 'amp-ads-google-adsense/amptoolkit-incontent-ads.php',
50
+ 'item_name'=>'Advanced AMP Ads',
51
+ 'store_url'=>'https://accounts.ampforwp.com',
52
  'is_activated'=>(is_plugin_active('amp-ads-google-adsense/amptoolkit-incontent-ads.php')? 1:2),
53
  ),
54
  array(
102
  'price'=>'$29',
103
  'url_link'=>'http://ampforwp.com/call-to-action/#utm_source=options-panel&utm_medium=extension-tab_amp-cta&utm_campaign=AMP%20Plugin',
104
  'plugin_active_path'=> 'AMP-cta/amp-cta.php',
105
+ 'item_name'=>'Call To Action for AMP',
106
  'store_url'=>'',
107
  'is_activated'=>(is_plugin_active('AMP-cta/amp-cta.php')? 1 : 2),
108
  ),
113
  'price'=>'$79',
114
  'url_link'=>'https://ampforwp.com/woocommerce/',
115
  'plugin_active_path'=> 'amp-woocommerce-pro/amp-woocommerce.php',
116
+ 'item_name'=>'WooCommerce',
117
  'store_url'=>'',
118
  'is_activated'=>(is_plugin_active('amp-woocommerce-pro/amp-woocommerce.php')? 1 : 2),
119
  ),
139
  'item_name'=>'Star Ratings',
140
  'store_url'=>'',
141
  'is_activated'=>(is_plugin_active('amp-rating/amp-rating.php')? 1 : 2),
 
 
 
 
 
 
 
 
 
 
 
142
  ),
143
  array(
144
  'name'=>'Custom Post Type',
4650
  'indent' => true,
4651
  //'start' => true,
4652
  //'label' => 'Tab 2',
 
 
 
4653
  ),
4654
  array(
4655
  'id' => 'menu-social',
includes/redirect.php CHANGED
@@ -18,18 +18,62 @@ function ampforwp_check_amp_page_status() {
18
  // AMP Takeover
19
  if ( isset($redux_builder_amp['ampforwp-amp-takeover']) && $redux_builder_amp['ampforwp-amp-takeover'] && !ampforwp_is_non_amp() ) {
20
  $redirection_location = '';
21
- if ( is_singular() ) {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
22
  $redirection_location = get_the_permalink();
23
  }
24
- if ( ampforwp_is_home() || ampforwp_is_front_page() || is_archive() || ampforwp_is_blog() ) {
25
- $redirection_location = add_query_arg( '', '', home_url( $wp->request ) );
26
-
27
- $redirection_location = trailingslashit($redirection_location );
28
-
29
- $redirection_location = dirname($redirection_location);
30
  }
 
31
  wp_safe_redirect( $redirection_location );
32
  exit;
 
33
  }
34
  }
35
  add_action( 'template_redirect', 'ampforwp_check_amp_page_status', 10 );
18
  // AMP Takeover
19
  if ( isset($redux_builder_amp['ampforwp-amp-takeover']) && $redux_builder_amp['ampforwp-amp-takeover'] && !ampforwp_is_non_amp() ) {
20
  $redirection_location = '';
21
+ $current_location = '';
22
+ $home_url = '';
23
+ $blog_page_id = '';
24
+
25
+ $current_location = home_url( $wp->request);
26
+ $home_url = get_bloginfo('url');
27
+
28
+ /*
29
+ * If certain conditions does not match then return early and exit from redirection
30
+ */
31
+ // Homepage
32
+ if ( ( ampforwp_is_home() || $current_location == $home_url ) && ! $redux_builder_amp['ampforwp-homepage-on-off-support'] ) {
33
+ return;
34
+ }
35
+
36
+ // Frontpage
37
+ if ( is_front_page() && $current_location == $home_url ) {
38
+ return;
39
+ }
40
+
41
+ // Archive
42
+ if ( is_archive() && ! $redux_builder_amp['ampforwp-archive-support'] ) {
43
+ return;
44
+ }
45
+
46
+ // AMP and non-amp Homepage
47
+ if ( is_home() && ampforwp_is_front_page() && ! ampforwp_is_home() ) {
48
+ return;
49
+ }
50
+
51
+ // Blog page
52
+ if ( ampforwp_is_blog() ) {
53
+ $blog_page_id = get_option('page_for_posts');
54
+ $redirection_location = get_the_permalink($blog_page_id);
55
+ }
56
+
57
+ // if the current page is ampfrontpage or normal frontpage take it to homepage of site
58
+ if ( ampforwp_is_front_page() || is_front_page() ) {
59
+ $redirection_location = $home_url;
60
+ }
61
+
62
+ // Single.php and page.php
63
+ if ( ( is_single() && $redux_builder_amp['amp-on-off-for-all-posts'] ) || ( is_page() && $redux_builder_amp['amp-on-off-for-all-pages'] ) ) {
64
  $redirection_location = get_the_permalink();
65
  }
66
+
67
+ /* Fallback, if for any reason, $redirection_location is still NULL
68
+ * then redirect it to homepage.
69
+ */
70
+ if ( empty( $redirection_location ) ) {
71
+ $redirection_location = $home_url;
72
  }
73
+
74
  wp_safe_redirect( $redirection_location );
75
  exit;
76
+
77
  }
78
  }
79
  add_action( 'template_redirect', 'ampforwp_check_amp_page_status', 10 );
includes/updater/update.php CHANGED
@@ -95,7 +95,7 @@ function ampForWP_extension_activate_license() {
95
  // Check if anything passed on a message constituting a failure
96
  $status = false;
97
  if ( ! empty( $message ) ) {
98
- if(is_object($license_data)){
99
  $status = $license_data->error;
100
  }else{
101
  $status = "An error occurred, Error type not found.";
95
  // Check if anything passed on a message constituting a failure
96
  $status = false;
97
  if ( ! empty( $message ) ) {
98
+ if(isset($license_data) && is_object($license_data)){
99
  $status = $license_data->error;
100
  }else{
101
  $status = "An error occurred, Error type not found.";
includes/vendor/amp/includes/sanitizers/class-amp-blacklist-sanitizer.php CHANGED
@@ -87,6 +87,7 @@ class AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
87
  if ( $element->hasAttributes() ) {
88
  $attr = $element->getAttribute('type');
89
  if ( '' !== $attr && 'application/ld+json' === $attr ) {
 
90
  continue;
91
  }
92
  }
87
  if ( $element->hasAttributes() ) {
88
  $attr = $element->getAttribute('type');
89
  if ( '' !== $attr && 'application/ld+json' === $attr ) {
90
+ $element->nodeValue = $element->textContent;
91
  continue;
92
  }
93
  }
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: mohammed_kaludi, ahmedkaludi, ampforwp
3
  Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, google, plugin, SEO
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
- Tested up to: 4.9.4
7
- Stable tag: 0.9.85.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -182,6 +182,19 @@ You can contact us from [here](http://ampforwp.com/contact/)
182
 
183
  == Changelog ==
184
 
 
 
 
 
 
 
 
 
 
 
 
 
 
185
  = 0.9.85 (3rd April 2018) =
186
  * For more detials check out [this blog post](https://ampforwp.com/0-9-85-released-stability-update-86th-update/)
187
  * Fixed: Fatal error: Allowed memory size on FrontPage #1865
3
  Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, google, plugin, SEO
4
  Donate link: https://www.paypal.me/Kaludi/25
5
  Requires at least: 3.0
6
+ Tested up to: 4.9.5
7
+ Stable tag: 0.9.85.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
182
 
183
  == Changelog ==
184
 
185
+ = 0.9.85.3 (12th April 2018) =
186
+ * Added: Custom Post type Archive Page support #1995
187
+ * Fixed: AMP TakeOver redirection issues #1994
188
+ * Fixed: Debug errors #1976
189
+ * Fixed: Social Profile pages were hidden for Design 1 to 3 #1996
190
+ * Fixed: Structured Data insertion was adding CData causing validation error #1999
191
+
192
+ = 0.9.85.2 =
193
+ * Minor Bugs fixed
194
+
195
+ = 0.9.85.1 =
196
+ * Minor Bugs fixed
197
+
198
  = 0.9.85 (3rd April 2018) =
199
  * For more detials check out [this blog post](https://ampforwp.com/0-9-85-released-stability-update-86th-update/)
200
  * Fixed: Fatal error: Allowed memory size on FrontPage #1865
templates/design-manager.php CHANGED
@@ -70,7 +70,7 @@ add_action('pre_amp_render_post','ampforwp_design_selector', 11 );
70
  function ampforwp_design_selector() {
71
 
72
  global $redux_builder_amp;
73
- if ( $redux_builder_amp['amp-design-selector'] ) {
74
  if ( file_exists(AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'.$redux_builder_amp['amp-design-selector'] . '/style.php') ) {
75
  return $redux_builder_amp['amp-design-selector'];
76
  }
70
  function ampforwp_design_selector() {
71
 
72
  global $redux_builder_amp;
73
+ if ( isset($redux_builder_amp['amp-design-selector']) && $redux_builder_amp['amp-design-selector'] ) {
74
  if ( file_exists(AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'.$redux_builder_amp['amp-design-selector'] . '/style.php') ) {
75
  return $redux_builder_amp['amp-design-selector'];
76
  }
templates/design-manager/swift/style.php CHANGED
@@ -39,7 +39,7 @@ amp-carousel > amp-img > img {object-fit: contain;}
39
  @font-face {font-family: 'icomoon';font-style: normal;font-weight: normal;src: local('icomoon'), local('icomoon'), url('<?php echo plugin_dir_url(__FILE__) ?>fonts/icomoon.ttf');}
40
  .cntr {max-width: 1100px;margin: 0 auto;width:100%;padding:0px 20px}
41
  header .cntr{
42
- <?php if($redux_builder_amp['swift-width-control']){?>
43
  max-width:<?php echo $redux_builder_amp['swift-width-control']?>;
44
  <?php }?>
45
  }
@@ -51,7 +51,7 @@ header .cntr{
51
  <?php if($redux_builder_amp['swift-padding-control']){?>padding: <?php echo $redux_builder_amp['swift-padding-control']['padding-top'] .' '.$redux_builder_amp['swift-padding-control']['padding-right'] .' '.$redux_builder_amp['swift-padding-control']['padding-bottom'] .' '.$redux_builder_amp['swift-padding-control']['padding-left'] ; ?>;<?php } ?>
52
  <?php if($redux_builder_amp['swift-margin-control']){?>margin: <?php echo $redux_builder_amp['swift-margin-control']['margin-top'] .' '.$redux_builder_amp['swift-margin-control']['margin-right'] .' '.$redux_builder_amp['swift-margin-control']['margin-bottom'] .' '.$redux_builder_amp['swift-margin-control']['margin-left'] ; ?>;<?php } ?>}
53
  .h_m_w{width:100%;clear:both;display: inline-flex;<?php if($redux_builder_amp['swift-height-control']){?>height:<?php echo $redux_builder_amp['swift-height-control']?>;<?php } ?>}
54
- .h-ic a:after, .h-ic a:before{font-family: 'icomoon';font-size: 23px;<?php if($redux_builder_amp['swift-element-color-control'] ['rgba']){?>color: <?php echo $redux_builder_amp['swift-element-color-control']['rgba']?>;<?php } ?>}
55
  .h-ic{align-self: center;}
56
  .h-call a:after{content: "\e0cd";lign-self: center;}
57
  .h-shop a:after{align-self: center;}
@@ -119,7 +119,7 @@ if($redux_builder_amp['menu-type'] == '1'){?>
119
  .tg, .fsc{display: none;}
120
  .fsc{width: 100%;height: -webkit-fill-available;position: absolute;cursor: pointer;top:0;left:0;}
121
  <?php if($redux_builder_amp['header-position-type'] == '1'){?>
122
- .tg:checked + .hamb-mnu > .m-ctr {margin-left: 0;border-right: 1px solid <?php echo $redux_builder_amp['swift-element-menu-border-color']['rgba']?>;}
123
  .tg:checked + .hamb-mnu > .m-ctr .c-btn {position: fixed;right: 0px;top:0px;}
124
  .m-ctr{margin-left: -100%;float: left;}
125
  <?php } ?>
@@ -129,8 +129,8 @@ if($redux_builder_amp['menu-type'] == '1'){?>
129
  <?php } ?>
130
  .tg:checked + .hamb-mnu > .fsc{display: block;background: rgba(0,0,0,.9);height:100vh;}
131
  .t-btn, .c-btn{cursor: pointer;}
132
- .t-btn:after{content:"\e5d2";display:inline-block;font-family: "icomoon";font-size:28px;<?php if($redux_builder_amp['swift-element-color-control']['rgba']){ ?>color: <?php echo $redux_builder_amp['swift-element-color-control']['rgba']?>;<?php } ?>}
133
- .c-btn:after{content: "\e5cd";font-family: "icomoon";font-size: 20px;<?php if($redux_builder_amp['swift-element-overlay-color-control'] ['rgba']){?>color: <?php echo $redux_builder_amp['swift-element-overlay-color-control']['rgba']?>;<?php } ?>line-height: 0;display: block;text-indent: 1px;}
134
  .c-btn{float: right;padding: 20px 10px;}
135
  .m-ctr{transition: margin 0.3s ease-in-out;}
136
  .m-ctr{<?php if($redux_builder_amp['header-overlay-width']){?>width:<?php echo $redux_builder_amp['header-overlay-width']?>;<?php } ?>height: auto;position: absolute;z-index:99;padding: 2% 0% 100vh 0%;}
@@ -149,7 +149,7 @@ if($redux_builder_amp['menu-type'] == '1'){?>
149
  .amp-menu li.menu-item-has-children>ul>li {width:100%;}
150
  .m-menu .amp-menu li.menu-item-has-children>ul>li{
151
  padding-left:0;
152
- border-bottom: 1px solid <?php echo $redux_builder_amp['swift-element-menu-border-color']['rgba']?>;
153
  margin:0px 10px;
154
  }
155
  .m-menu .amp-menu .sub-menu li:last-child{border:none;}
@@ -399,7 +399,7 @@ blockquote p {font-size: 34px; line-height: 1.4; font-weight: 700; position: rel
399
  blockquote p:before {content: "";border-top: 8px solid #000;width: 115px;line-height: 40px;display: inline-block;position: absolute;top: 0;}
400
 
401
  <?php // Comments Pagination
402
- if( 1 == $redux_builder_amp['wordpress-comments-support']){?>
403
  .cmts-wrap{display:flex;width:100%;margin-top: 30px;padding-bottom:30px;border-bottom:1px solid #eee;}
404
  .cmts-wrap .page-numbers:after{display:none;}
405
  .cmts .page-numbers{margin:0px 10px;}
@@ -479,7 +479,7 @@ if ( isset($redux_builder_amp['ampforwp-disqus-comments-support']) && $redux_bui
479
  }
480
  <?php } //Drop Cap CSS ends
481
  // Menu Search CSS
482
- if ( $redux_builder_amp['menu-search'] ) { ?>
483
  .m-srch #amp-search-submit {
484
  cursor: pointer;
485
  background: transparent;
@@ -508,7 +508,7 @@ if ( $redux_builder_amp['menu-search'] ) { ?>
508
  border-radius: 60px;
509
  }
510
  .m-srch{
511
- border-top: 1px solid <?php echo $redux_builder_amp['swift-element-menu-border-color']['rgba']?>;
512
  padding: 20px;
513
  }
514
  .m-srch .overlay-search:before{
@@ -517,10 +517,10 @@ if ( $redux_builder_amp['menu-search'] ) { ?>
517
  top:6px;
518
  }
519
  <?php } // Menu Search CSS Ends
520
- if ( $redux_builder_amp['menu-social'] ) { ?>
521
  .m-s-i {
522
  padding:25px 0px 15px 0px;
523
- border-top: 1px solid <?php echo $redux_builder_amp['swift-element-menu-border-color']['rgba']?>;
524
  text-align: center;
525
  }
526
  .m-s-i li{
@@ -569,14 +569,14 @@ if($redux_builder_amp['enbl-tbl']){?>
569
  .s_tbl:after {content: "\e940";}
570
  <?php } ?>
571
  <?php } // Menu social CSS Ends
572
- if( $redux_builder_amp['amp-swift-menu-cprt']){?>
573
  .cp-rgt{
574
  font-size:11px;
575
  line-height:1.2;
576
  color:<?php echo $redux_builder_amp['swift-element-overlay-color-control']['rgba']?>;
577
  padding: 20px;
578
  text-align: center;
579
- border-top: 1px solid <?php echo $redux_builder_amp['swift-element-menu-border-color']['rgba']?>;
580
  }
581
  .cp-rgt a{
582
  color:<?php echo $redux_builder_amp['swift-element-overlay-color-control']['rgba']?>;
@@ -615,7 +615,7 @@ if(is_single() ) { ?>
615
  }
616
 
617
  <?php } //is_single condition is added
618
- if ($redux_builder_amp['swift-sidebar']) { ?>
619
  .sp-artl{
620
  display:inline-flex;
621
  width:100%;
@@ -649,7 +649,7 @@ if ($redux_builder_amp['swift-sidebar']) { ?>
649
  <?php } // sidebar CSS ends
650
  } // single design 4 ends?>
651
  <?php // Header and Archive Sidebar
652
- if ($redux_builder_amp['gbl-sidebar']) { ?>
653
  .b-w, .arch-dsgn{
654
  display: flex;
655
  }
@@ -678,7 +678,7 @@ if ($redux_builder_amp['gbl-sidebar']) { ?>
678
 
679
  }
680
  <?php }
681
- if ($redux_builder_amp['gbl-sidebar'] || $redux_builder_amp['swift-sidebar'] ) { ?>
682
  /*** Sidebar CSS ***/
683
  .sdbr-right{
684
  <?php if( $redux_builder_amp['sidebar-bgcolor']['rgba'] ) {?>
@@ -692,7 +692,7 @@ if ($redux_builder_amp['gbl-sidebar'] || $redux_builder_amp['swift-sidebar'] ) {
692
  padding:20px;
693
  font-size: 16px;
694
  line-height: 1.5;
695
- <?php if( $redux_builder_amp['sbr-text-color']['rgba'] ) {?>
696
  color: <?php echo $redux_builder_amp['sbr-text-color']['rgba'] ?>;
697
  <?php } ?>
698
  }
@@ -701,7 +701,7 @@ if ($redux_builder_amp['gbl-sidebar'] || $redux_builder_amp['swift-sidebar'] ) {
701
  margin-bottom: 15px;
702
  }
703
  .amp-sidebar h4{
704
- <?php if( $redux_builder_amp['sbr-heading-color']['rgba'] ) {?>
705
  color: <?php echo $redux_builder_amp['sbr-heading-color']['rgba'] ?>;
706
  <?php } ?>
707
  margin-bottom:15px;
@@ -759,7 +759,7 @@ if ( isset($redux_builder_amp['footer-type']) && '1' == $redux_builder_amp['foot
759
  line-height:1.4;
760
  }
761
  <?php /*** New footer Features ***/
762
- if( true == $redux_builder_amp['footer-customize-options']) { ?>
763
  .f-w{
764
  flex-wrap:wrap;
765
  }
@@ -911,7 +911,7 @@ if($redux_builder_amp['enable-single-linkedin-share'] || $redux_builder_amp['enb
911
  .s_lk{background:#0077b5;}
912
  .s_lk:after{content: "\e934";}
913
  <?php }
914
- if($redux_builder_amp['enable-single-pinterest-share'] || $redux_builder_amp['enbl-pt']){?>
915
  .s_pt{background:#bd081c;}
916
  .s_pt:after{content:"\e937";}
917
  <?php }
39
  @font-face {font-family: 'icomoon';font-style: normal;font-weight: normal;src: local('icomoon'), local('icomoon'), url('<?php echo plugin_dir_url(__FILE__) ?>fonts/icomoon.ttf');}
40
  .cntr {max-width: 1100px;margin: 0 auto;width:100%;padding:0px 20px}
41
  header .cntr{
42
+ <?php if( isset($redux_builder_amp['swift-width-control']) && $redux_builder_amp['swift-width-control']){?>
43
  max-width:<?php echo $redux_builder_amp['swift-width-control']?>;
44
  <?php }?>
45
  }
51
  <?php if($redux_builder_amp['swift-padding-control']){?>padding: <?php echo $redux_builder_amp['swift-padding-control']['padding-top'] .' '.$redux_builder_amp['swift-padding-control']['padding-right'] .' '.$redux_builder_amp['swift-padding-control']['padding-bottom'] .' '.$redux_builder_amp['swift-padding-control']['padding-left'] ; ?>;<?php } ?>
52
  <?php if($redux_builder_amp['swift-margin-control']){?>margin: <?php echo $redux_builder_amp['swift-margin-control']['margin-top'] .' '.$redux_builder_amp['swift-margin-control']['margin-right'] .' '.$redux_builder_amp['swift-margin-control']['margin-bottom'] .' '.$redux_builder_amp['swift-margin-control']['margin-left'] ; ?>;<?php } ?>}
53
  .h_m_w{width:100%;clear:both;display: inline-flex;<?php if($redux_builder_amp['swift-height-control']){?>height:<?php echo $redux_builder_amp['swift-height-control']?>;<?php } ?>}
54
+ h-ic a:after, .h-ic a:before{font-family: 'icomoon';font-size: 23px;<?php if(isset($redux_builder_amp['swift-element-color-control'] ['rgba']) && $redux_builder_amp['swift-element-color-control'] ['rgba']){?>color: <?php echo $redux_builder_amp['swift-element-color-control']['rgba']?>;<?php } ?>}
55
  .h-ic{align-self: center;}
56
  .h-call a:after{content: "\e0cd";lign-self: center;}
57
  .h-shop a:after{align-self: center;}
119
  .tg, .fsc{display: none;}
120
  .fsc{width: 100%;height: -webkit-fill-available;position: absolute;cursor: pointer;top:0;left:0;}
121
  <?php if($redux_builder_amp['header-position-type'] == '1'){?>
122
+ .tg:checked + .hamb-mnu > .m-ctr {margin-left: 0;border-right: 1px solid <?php if(isset($redux_builder_amp['swift-element-menu-border-color']['rgba'])){echo $redux_builder_amp['swift-element-menu-border-color']['rgba'];}?>;}
123
  .tg:checked + .hamb-mnu > .m-ctr .c-btn {position: fixed;right: 0px;top:0px;}
124
  .m-ctr{margin-left: -100%;float: left;}
125
  <?php } ?>
129
  <?php } ?>
130
  .tg:checked + .hamb-mnu > .fsc{display: block;background: rgba(0,0,0,.9);height:100vh;}
131
  .t-btn, .c-btn{cursor: pointer;}
132
+ .t-btn:after{content:"\e5d2";display:inline-block;font-family: "icomoon";font-size:28px;<?php if( isset($redux_builder_amp['swift-element-color-control']['rgba']) && $redux_builder_amp['swift-element-color-control']['rgba']){ ?>color: <?php echo $redux_builder_amp['swift-element-color-control']['rgba']?>;<?php } ?>}
133
+ .c-btn:after{content: "\e5cd";font-family: "icomoon";font-size: 20px;<?php if(isset($redux_builder_amp['swift-element-overlay-color-control'] ['rgba']) && $redux_builder_amp['swift-element-overlay-color-control'] ['rgba']){?>color: <?php echo $redux_builder_amp['swift-element-overlay-color-control']['rgba']?>;<?php } ?>line-height: 0;display: block;text-indent: 1px;}
134
  .c-btn{float: right;padding: 20px 10px;}
135
  .m-ctr{transition: margin 0.3s ease-in-out;}
136
  .m-ctr{<?php if($redux_builder_amp['header-overlay-width']){?>width:<?php echo $redux_builder_amp['header-overlay-width']?>;<?php } ?>height: auto;position: absolute;z-index:99;padding: 2% 0% 100vh 0%;}
149
  .amp-menu li.menu-item-has-children>ul>li {width:100%;}
150
  .m-menu .amp-menu li.menu-item-has-children>ul>li{
151
  padding-left:0;
152
+ border-bottom: 1px solid <?php if(isset($redux_builder_amp['swift-element-menu-border-color']['rgba'])){echo $redux_builder_amp['swift-element-menu-border-color']['rgba'];}?>;
153
  margin:0px 10px;
154
  }
155
  .m-menu .amp-menu .sub-menu li:last-child{border:none;}
399
  blockquote p:before {content: "";border-top: 8px solid #000;width: 115px;line-height: 40px;display: inline-block;position: absolute;top: 0;}
400
 
401
  <?php // Comments Pagination
402
+ if( isset($redux_builder_amp['wordpress-comments-support']) && 1 == $redux_builder_amp['wordpress-comments-support']){?>
403
  .cmts-wrap{display:flex;width:100%;margin-top: 30px;padding-bottom:30px;border-bottom:1px solid #eee;}
404
  .cmts-wrap .page-numbers:after{display:none;}
405
  .cmts .page-numbers{margin:0px 10px;}
479
  }
480
  <?php } //Drop Cap CSS ends
481
  // Menu Search CSS
482
+ if ( isset($redux_builder_amp['menu-search']) && $redux_builder_amp['menu-search'] ) { ?>
483
  .m-srch #amp-search-submit {
484
  cursor: pointer;
485
  background: transparent;
508
  border-radius: 60px;
509
  }
510
  .m-srch{
511
+ border-top: 1px solid <?php if(isset($redux_builder_amp['swift-element-menu-border-color']['rgba'])){echo $redux_builder_amp['swift-element-menu-border-color']['rgba'];}?>;
512
  padding: 20px;
513
  }
514
  .m-srch .overlay-search:before{
517
  top:6px;
518
  }
519
  <?php } // Menu Search CSS Ends
520
+ if ( isset($redux_builder_amp['menu-social']) && $redux_builder_amp['menu-social'] ) { ?>
521
  .m-s-i {
522
  padding:25px 0px 15px 0px;
523
+ border-top: 1px solid <?php if(isset($redux_builder_amp['swift-element-menu-border-color']['rgba'])){ echo $redux_builder_amp['swift-element-menu-border-color']['rgba'];}?>;
524
  text-align: center;
525
  }
526
  .m-s-i li{
569
  .s_tbl:after {content: "\e940";}
570
  <?php } ?>
571
  <?php } // Menu social CSS Ends
572
+ if( isset($redux_builder_amp['amp-swift-menu-cprt']) && $redux_builder_amp['amp-swift-menu-cprt']){?>
573
  .cp-rgt{
574
  font-size:11px;
575
  line-height:1.2;
576
  color:<?php echo $redux_builder_amp['swift-element-overlay-color-control']['rgba']?>;
577
  padding: 20px;
578
  text-align: center;
579
+ border-top: 1px solid <?php if(isset($redux_builder_amp['swift-element-menu-border-color']['rgba'])){ echo $redux_builder_amp['swift-element-menu-border-color']['rgba'];}?>;
580
  }
581
  .cp-rgt a{
582
  color:<?php echo $redux_builder_amp['swift-element-overlay-color-control']['rgba']?>;
615
  }
616
 
617
  <?php } //is_single condition is added
618
+ if (isset($redux_builder_amp['swift-sidebar']) && $redux_builder_amp['swift-sidebar']) { ?>
619
  .sp-artl{
620
  display:inline-flex;
621
  width:100%;
649
  <?php } // sidebar CSS ends
650
  } // single design 4 ends?>
651
  <?php // Header and Archive Sidebar
652
+ if (isset($redux_builder_amp['gbl-sidebar']) && $redux_builder_amp['gbl-sidebar']) { ?>
653
  .b-w, .arch-dsgn{
654
  display: flex;
655
  }
678
 
679
  }
680
  <?php }
681
+ if (isset($redux_builder_amp['gbl-sidebar']) && $redux_builder_amp['gbl-sidebar'] ||isset($redux_builder_amp['swift-sidebar']) && $redux_builder_amp['swift-sidebar'] ) { ?>
682
  /*** Sidebar CSS ***/
683
  .sdbr-right{
684
  <?php if( $redux_builder_amp['sidebar-bgcolor']['rgba'] ) {?>
692
  padding:20px;
693
  font-size: 16px;
694
  line-height: 1.5;
695
+ <?php if(isset($redux_builder_amp['sbr-text-color']['rgba']) && $redux_builder_amp['sbr-text-color']['rgba'] ) {?>
696
  color: <?php echo $redux_builder_amp['sbr-text-color']['rgba'] ?>;
697
  <?php } ?>
698
  }
701
  margin-bottom: 15px;
702
  }
703
  .amp-sidebar h4{
704
+ <?php if(isset($redux_builder_amp['sbr-heading-color']['rgba']) && $redux_builder_amp['sbr-heading-color']['rgba'] ) {?>
705
  color: <?php echo $redux_builder_amp['sbr-heading-color']['rgba'] ?>;
706
  <?php } ?>
707
  margin-bottom:15px;
759
  line-height:1.4;
760
  }
761
  <?php /*** New footer Features ***/
762
+ if( isset($redux_builder_amp['footer-customize-options']) && true == $redux_builder_amp['footer-customize-options']) { ?>
763
  .f-w{
764
  flex-wrap:wrap;
765
  }
911
  .s_lk{background:#0077b5;}
912
  .s_lk:after{content: "\e934";}
913
  <?php }
914
+ if($redux_builder_amp['enable-single-pinterest-share'] || isset($redux_builder_amp['enbl-pt']) && $redux_builder_amp['enbl-pt']){?>
915
  .s_pt{background:#bd081c;}
916
  .s_pt:after{content:"\e937";}
917
  <?php }
templates/features.php CHANGED
@@ -151,7 +151,7 @@ add_amp_theme_support('AMP-loop');
151
 
152
  include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
153
  $amp_plugin_activation_check = is_plugin_active( 'amp/amp.php' );
154
- if ( 4 != $redux_builder_amp['amp-design-selector'] ) {
155
  if ( $amp_plugin_activation_check ) {
156
  $amp_plugin_data = get_plugin_data( AMPFORWP_MAIN_PLUGIN_DIR. 'amp/amp.php' );
157
  if ( $amp_plugin_data['Version'] > '0.4.2' ) {
@@ -395,7 +395,7 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
395
  $file = AMPFORWP_PLUGIN_DIR . '/templates/design-manager/design-'. ampforwp_design_selector() .'/index.php';
396
  }
397
  }
398
- if ( ampforwp_is_front_page() || ( true == $redux_builder_amp['ampforwp-amp-takeover'] && is_front_page()) ) {
399
 
400
  $file = AMPFORWP_PLUGIN_DIR . '/templates/design-manager/design-'. ampforwp_design_selector() .'/frontpage.php';
401
  }
151
 
152
  include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
153
  $amp_plugin_activation_check = is_plugin_active( 'amp/amp.php' );
154
+ if ( isset ($redux_builder_amp['amp-design-selector']) && 4 != $redux_builder_amp['amp-design-selector'] ) {
155
  if ( $amp_plugin_activation_check ) {
156
  $amp_plugin_data = get_plugin_data( AMPFORWP_MAIN_PLUGIN_DIR. 'amp/amp.php' );
157
  if ( $amp_plugin_data['Version'] > '0.4.2' ) {
395
  $file = AMPFORWP_PLUGIN_DIR . '/templates/design-manager/design-'. ampforwp_design_selector() .'/index.php';
396
  }
397
  }
398
+ if ( ampforwp_is_front_page() || ( true == $redux_builder_amp['ampforwp-amp-takeover'] && is_front_page() && $redux_builder_amp['amp-frontpage-select-option']) ) {
399
 
400
  $file = AMPFORWP_PLUGIN_DIR . '/templates/design-manager/design-'. ampforwp_design_selector() .'/frontpage.php';
401
  }