AMP for WP – Accelerated Mobile Pages - Version 1.0.62

Version Description

(15th August 2020) = * Improvement: Added Yoast Local SEO plugin compatibility #4170 * Improvement: Added option for changing the tags for the accordion module in AMP Page Builder #4208 * Improvement: Added option for showing primary category of Yoast #4495 * Improvement: Added condition for adding infinite scroll in AMP Woocommerce #4673 * Improvement: Added excerpt option in in-content related posts #3981 * Fixed: AMP not working on the Homepage with WP Ultimate recipe plugin #4538 * Fixed: CSS overiding issue for the list and accourdion modules in AMP Page Builder #4674 * Fixed: Alignment issue on homepage in design one #4676 * Fixed: Debug Errors #4671

Download this release

Release Info

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

Code changes from version 1.0.61.2 to 1.0.62

Files changed (21) hide show
  1. README.md +13 -2
  2. accelerated-moblie-pages.php +6 -4
  3. changelog.txt +11 -0
  4. classes/class-ampforwp-infinite-scroll.php +1 -1
  5. components/breadcrumb/breadcrumb.php +3 -0
  6. components/categories-tags/categories-tags.php +10 -1
  7. includes/features/performance/performance-functions.php +3 -1
  8. includes/options/admin-config.php +22 -0
  9. includes/options/redux-core/inc/class.redux_helpers.php +3 -0
  10. includes/thirdparty-compatibility.php +36 -0
  11. pagebuilder/inc/viewShowFrontData.php +7 -3
  12. pagebuilder/modules/accordion-mod-module.php +24 -8
  13. pagebuilder/modules/list-mod-module.php +4 -4
  14. readme.txt +13 -2
  15. templates/design-manager/design-1/footer.php +1 -0
  16. templates/design-manager/design-1/style.php +2 -2
  17. templates/design-manager/design-2/footer.php +1 -0
  18. templates/design-manager/design-3/footer.php +1 -0
  19. templates/design-manager/swift/footer.php +1 -0
  20. templates/design-manager/swift/style.php +9 -1
  21. templates/features.php +10 -9
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: 5.4.2
7
- Stable tag: 1.0.61.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -193,6 +193,17 @@ Device testing done through [BrowserStack](https://www.browserstack.com)
193
 
194
  == Changelog ==
195
 
 
 
 
 
 
 
 
 
 
 
 
196
  = 1.0.61.2 (5th August 2020) =
197
  * Fixed: Removed Helpscout Beacon from Options Panel #4682
198
 
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: 5.5
7
+ Stable tag: 1.0.62
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
193
 
194
  == Changelog ==
195
 
196
+ = 1.0.62 (15th August 2020) =
197
+ * Improvement: Added Yoast Local SEO plugin compatibility #4170
198
+ * Improvement: Added option for changing the tags for the accordion module in AMP Page Builder #4208
199
+ * Improvement: Added option for showing primary category of Yoast #4495
200
+ * Improvement: Added condition for adding infinite scroll in AMP Woocommerce #4673
201
+ * Improvement: Added excerpt option in in-content related posts #3981
202
+ * Fixed: AMP not working on the Homepage with WP Ultimate recipe plugin #4538
203
+ * Fixed: CSS overiding issue for the list and accourdion modules in AMP Page Builder #4674
204
+ * Fixed: Alignment issue on homepage in design one #4676
205
+ * Fixed: Debug Errors #4671
206
+
207
  = 1.0.61.2 (5th August 2020) =
208
  * Fixed: Removed Helpscout Beacon from Options Panel #4682
209
 
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: 1.0.61.2
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: https://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/25
@@ -20,7 +20,7 @@ define('AMPFORWP_PLUGIN_DIR_URI', plugin_dir_url(__FILE__));
20
  define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22
  define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23
- define('AMPFORWP_VERSION','1.0.61.2');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
@@ -1079,7 +1079,9 @@ function ampforwp_get_all_post_types(){
1079
  }
1080
  $post_types = array_merge($post_types, $selected_post_types);
1081
  }
1082
-
 
 
1083
  return $post_types;
1084
  }
1085
 
@@ -1196,7 +1198,7 @@ function ampforwp_delete_plugins_manager_transient($plugin){
1196
  add_action('pre_amp_render_post', 'ampforwp_initialise_classes');
1197
  if ( ! function_exists('ampforwp_initialise_classes') ) {
1198
  function ampforwp_initialise_classes(){
1199
- if ( true == ampforwp_get_setting('ampforwp-infinite-scroll') ) {
1200
  require AMPFORWP_PLUGIN_DIR .'/classes/class-ampforwp-infinite-scroll.php';
1201
  }
1202
  }
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: 1.0.62
7
  Author: Ahmed Kaludi, Mohammed Kaludi
8
  Author URI: https://ampforwp.com/
9
  Donate link: https://www.paypal.me/Kaludi/25
20
  define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21
  define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22
  define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23
+ define('AMPFORWP_VERSION','1.0.62');
24
  define('AMPFORWP_EXTENSION_DIR',plugin_dir_path(__FILE__).'includes/options/extensions');
25
  if(!defined('AMPFROWP_HOST_NAME')){
26
  $urlinfo = get_bloginfo('url');
1079
  }
1080
  $post_types = array_merge($post_types, $selected_post_types);
1081
  }
1082
+ if(class_exists('WPUltimateRecipe') && ampforwp_is_home()){
1083
+ $post_types['recipe'] = 'recipe';
1084
+ }
1085
  return $post_types;
1086
  }
1087
 
1198
  add_action('pre_amp_render_post', 'ampforwp_initialise_classes');
1199
  if ( ! function_exists('ampforwp_initialise_classes') ) {
1200
  function ampforwp_initialise_classes(){
1201
+ if ( true == ampforwp_get_setting('ampforwp-infinite-scroll') || true == ampforwp_get_setting('ampforwp-wcp-infinite-scroll') ) {
1202
  require AMPFORWP_PLUGIN_DIR .'/classes/class-ampforwp-infinite-scroll.php';
1203
  }
1204
  }
changelog.txt CHANGED
@@ -1,5 +1,16 @@
1
  == Changelog ==
2
 
 
 
 
 
 
 
 
 
 
 
 
3
  = 1.0.61.2 (5th August 2020) =
4
  * Fixed: Removed Helpscout Beacon from Options Panel #4682
5
 
1
  == Changelog ==
2
 
3
+ = 1.0.62 (15th August 2020) =
4
+ * Improvement: Added Yoast Local SEO plugin compatibility #4170
5
+ * Improvement: Added option for changing the tags for the accordion module in AMP Page Builder #4208
6
+ * Improvement: Added option for showing primary category of Yoast #4495
7
+ * Improvement: Added condition for adding infinite scroll in AMP Woocommerce #4673
8
+ * Improvement: Added excerpt option in in-content related posts #3981
9
+ * Fixed: AMP not working on the Homepage with WP Ultimate recipe plugin #4538
10
+ * Fixed: CSS overiding issue for the list and accourdion modules in AMP Page Builder #4674
11
+ * Fixed: Alignment issue on homepage in design one #4676
12
+ * Fixed: Debug Errors #4671
13
+
14
  = 1.0.61.2 (5th August 2020) =
15
  * Fixed: Removed Helpscout Beacon from Options Panel #4682
16
 
classes/class-ampforwp-infinite-scroll.php CHANGED
@@ -49,7 +49,7 @@ if( ! class_exists('AMPforWP_Infinite_Scroll') ) {
49
  }
50
  public function is_loop() {
51
  $script = true;
52
- if ( (ampforwp_is_home() || is_archive()) && true == ampforwp_get_setting('ampforwp-infinite-scroll-home') ) {
53
  if( function_exists('is_product_category') && is_product_category() || function_exists('is_product_tag') && is_product_tag() || function_exists('is_shop') && is_shop()){
54
  $script = false;
55
  }
49
  }
50
  public function is_loop() {
51
  $script = true;
52
+ if ( (ampforwp_is_home() || is_archive()) && (true == ampforwp_get_setting('ampforwp-infinite-scroll-home') || true == ampforwp_get_setting('ampforwp-wcp-infinite-scroll') ) ) {
53
  if( function_exists('is_product_category') && is_product_category() || function_exists('is_product_tag') && is_product_tag() || function_exists('is_shop') && is_shop()){
54
  $script = false;
55
  }
components/breadcrumb/breadcrumb.php CHANGED
@@ -132,6 +132,9 @@ function amp_breadcrumb_output(){
132
  foreach($cat_parents as $parents) {
133
  $categories = get_the_category();
134
  $cat_id = $categories[0]->cat_ID;
 
 
 
135
  $cat_link = get_category_link($cat_id);
136
  if(ampforwp_get_setting('ampforwp-archive-support-cat') == true && ampforwp_get_setting('ampforwp-archive-support') == true){
137
  $cat_link = ampforwp_url_controller( $cat_link );
132
  foreach($cat_parents as $parents) {
133
  $categories = get_the_category();
134
  $cat_id = $categories[0]->cat_ID;
135
+ if(class_exists( 'WPSEO_Options' )){
136
+ $cat_id = $primary_cateogory;
137
+ }
138
  $cat_link = get_category_link($cat_id);
139
  if(ampforwp_get_setting('ampforwp-archive-support-cat') == true && ampforwp_get_setting('ampforwp-archive-support') == true){
140
  $cat_link = ampforwp_url_controller( $cat_link );
components/categories-tags/categories-tags.php CHANGED
@@ -24,9 +24,18 @@ function ampforwp_framework_get_categories_list( $separator = '' ){
24
  if( true == ampforwp_get_setting('ampforwp-archive-support') && true == ampforwp_get_setting('ampforwp-archive-support-cat')){
25
  $url = ampforwp_url_controller($url);
26
  }
 
 
 
 
 
 
 
 
 
27
  $anchorTag = '<a href="'.esc_url($url).'" title="'.esc_html($term_name).'">';
28
  $anchorClose = "</a>";
29
- echo ('<span class="amp-cat amp-cat-'.esc_attr($term_id).'">'.$anchorTag.esc_html($term_name).$anchorClose.'</span>');
30
  }else{
31
  echo ('<span class="amp-cat"> '.esc_html($term_name).'</span>');
32
  }
24
  if( true == ampforwp_get_setting('ampforwp-archive-support') && true == ampforwp_get_setting('ampforwp-archive-support-cat')){
25
  $url = ampforwp_url_controller($url);
26
  }
27
+ $cat = "";
28
+ if(true == ampforwp_get_setting('ampforwp-cats-single-primary')){
29
+ $cat = get_post_meta(ampforwp_get_the_ID(), '_yoast_wpseo_primary_category',true);
30
+ if($term_id == $cat){
31
+ $cat = 'primary';
32
+ }else{
33
+ $cat = "";
34
+ }
35
+ }
36
  $anchorTag = '<a href="'.esc_url($url).'" title="'.esc_html($term_name).'">';
37
  $anchorClose = "</a>";
38
+ echo ('<span class="amp-cat amp-cat-'.esc_attr($term_id).' '.esc_attr($cat).' ">'.$anchorTag.esc_html($term_name).$anchorClose.'</span>');
39
  }else{
40
  echo ('<span class="amp-cat"> '.esc_html($term_name).'</span>');
41
  }
includes/features/performance/performance-functions.php CHANGED
@@ -27,7 +27,9 @@ function ampforwp_minify_html_output($content_buffer){
27
  if(class_exists('Cli_Optimizer') && preg_match('/<style type="text\/css">@font-face(.*?)<\/style>/s', $content_buffer)!=0){
28
  $content_buffer = preg_replace('/<style type="text\/css">@font-face(.*?)<\/style>/s', '', $content_buffer);
29
  }
30
-
 
 
31
  global $redux_builder_amp;
32
  if(!$redux_builder_amp['ampforwp_cache_minimize_mode']){
33
  return $content_buffer;
27
  if(class_exists('Cli_Optimizer') && preg_match('/<style type="text\/css">@font-face(.*?)<\/style>/s', $content_buffer)!=0){
28
  $content_buffer = preg_replace('/<style type="text\/css">@font-face(.*?)<\/style>/s', '', $content_buffer);
29
  }
30
+ // if(preg_match('/<script(.*?)type="text\/javascript"(.*?)>[\s\S]*?<\/script>/', $content_buffer)){
31
+ // $content_buffer = preg_replace('/<script(.*?)type="text\/javascript"(.*?)>[\s\S]*?<\/script>/', '', $content_buffer);
32
+ // }
33
  global $redux_builder_amp;
34
  if(!$redux_builder_amp['ampforwp_cache_minimize_mode']){
35
  return $content_buffer;
includes/options/admin-config.php CHANGED
@@ -5628,6 +5628,17 @@ Redux::setSection( $opt_name, array(
5628
  ),
5629
  )
5630
  ));
 
 
 
 
 
 
 
 
 
 
 
5631
  if(!is_plugin_active( 'amp-newspaper-theme/ampforwp-custom-theme.php' ) ){
5632
  function ampforwp_get_post_percent(){
5633
  return 0;
@@ -5785,6 +5796,7 @@ $single_page_options = array(
5785
  esc_html__('Enable this option to show categories in AMP and', 'accelerated-mobile-pages'), esc_url('https://ampforwp.com/tutorials/article/how-to-show-categories-in-single-page/'),esc_html__('Click Here','accelerated-mobile-pages'), esc_html__('for more info','accelerated-mobile-pages')),
5786
 
5787
  ),
 
5788
  //Tags ON/OFF
5789
  array(
5790
  'id' => 'ampforwp-tags-single',
@@ -6256,6 +6268,16 @@ $single_page_options = array(
6256
  'default' => 0,
6257
  'required' => array( array('ampforwp-inline-related-posts', '=' , '1') ),
6258
  ),
 
 
 
 
 
 
 
 
 
 
6259
  array(
6260
  'id' => 'ampforwp-number-of-inline-related-posts',
6261
  'type' => 'text',
5628
  ),
5629
  )
5630
  ));
5631
+ $yoast_primary_cat = '';
5632
+ if(class_exists('WPSEO_Options')){
5633
+ $yoast_primary_cat = array(
5634
+ 'id' => 'ampforwp-cats-single-primary',
5635
+ 'type' => 'switch',
5636
+ 'class' => 'child_opt child_opt_arrow',
5637
+ 'title' => esc_html__('Show Only Primary Category', 'accelerated-mobile-pages'),
5638
+ 'default' => '0',
5639
+ 'required' => array('ampforwp-cats-single' , '=' , 1),
5640
+ );
5641
+ }
5642
  if(!is_plugin_active( 'amp-newspaper-theme/ampforwp-custom-theme.php' ) ){
5643
  function ampforwp_get_post_percent(){
5644
  return 0;
5796
  esc_html__('Enable this option to show categories in AMP and', 'accelerated-mobile-pages'), esc_url('https://ampforwp.com/tutorials/article/how-to-show-categories-in-single-page/'),esc_html__('Click Here','accelerated-mobile-pages'), esc_html__('for more info','accelerated-mobile-pages')),
5797
 
5798
  ),
5799
+ $yoast_primary_cat,
5800
  //Tags ON/OFF
5801
  array(
5802
  'id' => 'ampforwp-tags-single',
6268
  'default' => 0,
6269
  'required' => array( array('ampforwp-inline-related-posts', '=' , '1') ),
6270
  ),
6271
+ array(
6272
+ 'id' => 'ampforwp-incontent-related-posts-excerpt',
6273
+ 'type' => 'switch',
6274
+ 'class' => 'child_opt',
6275
+ 'title' => esc_html__('Excerpt', 'accelerated-mobile-pages'),
6276
+ 'default' => 1,
6277
+ 'required' => array(
6278
+ array('ampforwp-inline-related-posts', '=' , '1')
6279
+ ),
6280
+ ),
6281
  array(
6282
  'id' => 'ampforwp-number-of-inline-related-posts',
6283
  'type' => 'text',
includes/options/redux-core/inc/class.redux_helpers.php CHANGED
@@ -340,15 +340,18 @@ namespace ReduxCore\ReduxFramework;
340
  * @since ReduxFramework 3.0.4
341
  */
342
  public static function hex2rgba( $hex, $alpha = '' ) {
 
343
  $hex = str_replace( "#", "", $hex );
344
  if ( strlen( $hex ) == 3 ) {
345
  $r = hexdec( substr( $hex, 0, 1 ) . substr( $hex, 0, 1 ) );
346
  $g = hexdec( substr( $hex, 1, 1 ) . substr( $hex, 1, 1 ) );
347
  $b = hexdec( substr( $hex, 2, 1 ) . substr( $hex, 2, 1 ) );
348
  } else {
 
349
  $r = hexdec( substr( $hex, 0, 2 ) );
350
  $g = hexdec( substr( $hex, 2, 2 ) );
351
  $b = hexdec( substr( $hex, 4, 2 ) );
 
352
  }
353
  $rgb = $r . ',' . $g . ',' . $b;
354
 
340
  * @since ReduxFramework 3.0.4
341
  */
342
  public static function hex2rgba( $hex, $alpha = '' ) {
343
+ $r = $g = $b = '';
344
  $hex = str_replace( "#", "", $hex );
345
  if ( strlen( $hex ) == 3 ) {
346
  $r = hexdec( substr( $hex, 0, 1 ) . substr( $hex, 0, 1 ) );
347
  $g = hexdec( substr( $hex, 1, 1 ) . substr( $hex, 1, 1 ) );
348
  $b = hexdec( substr( $hex, 2, 1 ) . substr( $hex, 2, 1 ) );
349
  } else {
350
+ if (ctype_xdigit($hex)) {
351
  $r = hexdec( substr( $hex, 0, 2 ) );
352
  $g = hexdec( substr( $hex, 2, 2 ) );
353
  $b = hexdec( substr( $hex, 4, 2 ) );
354
+ }
355
  }
356
  $rgb = $r . ',' . $g . ',' . $b;
357
 
includes/thirdparty-compatibility.php CHANGED
@@ -1189,4 +1189,40 @@ function ampforwp_is_amp_inURL($url){
1189
  return false;
1190
  }
1191
  return true;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1192
  }
1189
  return false;
1190
  }
1191
  return true;
1192
+ }
1193
+ function ampforwp_show_yoast_seo_local_map($content){
1194
+ if(function_exists('wpseo_local_seo_init') && preg_match('/wpseo-map-canvas/', $content)){
1195
+ $options = get_option( 'wpseo_local' );
1196
+ $local_address = $options['location_address'];
1197
+ $location_city = $options['location_city'];
1198
+ $location_state = $options['location_state'];
1199
+ $location_zipcode = $options['location_zipcode'];
1200
+ $location_country = $options['location_country'];
1201
+ $address = $local_address.", ".$location_city.", ".$location_state.", ".$location_zipcode.", ".$location_country;
1202
+ $location_coords_lat = $options['location_coords_lat'];
1203
+ $location_coords_long = $options['location_coords_long'];
1204
+ $googlemaps_api_key = $options['googlemaps_api_key'];
1205
+ $map_str = '<iframe width="350" height="250" frameborder="0" style="border:0" src="https://www.google.com/maps/embed/v1/place?key='.esc_attr($googlemaps_api_key).'&q='.urlencode($address).'&center='.esc_attr($location_coords_lat).','.esc_attr($location_coords_long).'" allowfullscreen>
1206
+ </iframe>';
1207
+ $sanitizer = new AMPFORWP_Content( $map_str, array(),
1208
+ apply_filters( 'ampforwp_content_sanitizers',
1209
+ array(
1210
+ 'AMP_Style_Sanitizer' => array(),
1211
+ 'AMP_Blacklist_Sanitizer' => array(),
1212
+ 'AMP_Img_Sanitizer' => array(),
1213
+ 'AMP_Video_Sanitizer' => array(),
1214
+ 'AMP_Audio_Sanitizer' => array(),
1215
+ 'AMP_Iframe_Sanitizer' => array(
1216
+ 'add_placeholder' => true,
1217
+ )
1218
+ ) ) );
1219
+ $map_str = $sanitizer->get_amp_content();
1220
+ $content = preg_replace('/(<div\sid="(.*?)"(.*?)class="wpseo-map-canvas(.*?)">)(.*?)(<\/div>)/s', '$1'.$map_str.'$6', $content);
1221
+ preg_match('/(<div\sid="(.*?)"(.*?)class="wpseo-map-canvas(.*?)">)(.*?)(<\/div>)/s', $content,$match);
1222
+ if(isset($match[4])){
1223
+ $content = str_replace($match[4], '', $content);
1224
+ }
1225
+ $content = preg_replace('/<div id="wpseo-directions-wrapper">(.*?)<\/div>/s','', $content);
1226
+ }
1227
+ return $content;
1228
  }
pagebuilder/inc/viewShowFrontData.php CHANGED
@@ -426,7 +426,6 @@ function amp_pagebuilder_content_styles(){
426
  if(!isset($moduleTemplate[$contentArray['type']]['repeater']['front_css'])){
427
  continue;
428
  }
429
- $repeaterFrontCss = $moduleTemplate[$contentArray['type']]['repeater']['front_css'];
430
 
431
  if($moduleField['content_type']=='css'){
432
  $repeaterFrontCss = str_replace('{{repeater-module-class}}', $moduleField['name'].'_'.$repeaterVarIndex, $repeaterFrontCss);
@@ -456,8 +455,13 @@ function amp_pagebuilder_content_styles(){
456
  $repeaterFrontCss
457
  );
458
  }
459
-
460
-
 
 
 
 
 
461
  }
462
  }
463
  $repeaterFieldsCss .= $repeaterFrontCss;
426
  if(!isset($moduleTemplate[$contentArray['type']]['repeater']['front_css'])){
427
  continue;
428
  }
 
429
 
430
  if($moduleField['content_type']=='css'){
431
  $repeaterFrontCss = str_replace('{{repeater-module-class}}', $moduleField['name'].'_'.$repeaterVarIndex, $repeaterFrontCss);
455
  $repeaterFrontCss
456
  );
457
  }
458
+ }else{
459
+ $repeaterCss = $moduleTemplate[$contentArray['type']]['repeater']['front_css'];
460
+ if(strpos($repeaterCss, '{{'.$moduleField['name'].'}}')!==false){
461
+ $repeaterFrontCss = $repeaterCss;
462
+ $replace_with = $repeaterUserValues[$moduleField['name'].'_'.$repeaterVarIndex];
463
+ $repeaterFrontCss = str_replace('{{'.$moduleField['name'].'}}',$replace_with, $repeaterFrontCss);
464
+ }
465
  }
466
  }
467
  $repeaterFieldsCss .= $repeaterFrontCss;
pagebuilder/modules/accordion-mod-module.php CHANGED
@@ -4,15 +4,14 @@ if ( ! defined( 'ABSPATH' ) ) exit;
4
  $output =
5
  '<amp-accordion {{if_id}}id="{{id}}"{{ifend_id}} {{if_user_class}}class="{{user_class}}{{ifend_user_class}}">{{repeater}}</amp-accordion>';
6
  $css = '
7
- .accordion-mod{margin:{{margin_css}};padding:{{padding_css}};}
8
  amp-accordion section[expanded] .show-more {display: none;}
9
  amp-accordion section:not([expanded]) .show-less {display: none;}
10
- .accordion-mod h5:before{content: "+";font-size: 24px;color: #999;margin-right: 10px;position: relative;top: 1px;}
11
- .accordion-mod h5:hover{color:#000;}
12
- .accordion-mod section[expanded] h5:before{content:"-"}
13
- .accordion-mod .acc-lbl{background: none;border: 0;padding: 0;margin:10px 0px 15px 0;color: {{acc_color_picker}};font-size: 22px;line-height: 1.5em;font-weight: normal; }
14
- .accordion-mod .acc-desc{margin-bottom:0;margin:-5px 0px 20px 23px;padding: 0;color:#666;font-size: 14px;line-height: 1.5em;}
15
- ';
16
  return array(
17
  'label' =>'Accordion',
18
  'name' =>'accordion-mod',
@@ -88,6 +87,7 @@ return array(
88
  'front_common_css'=>'',
89
  'repeater'=>array(
90
  'tab'=>'customizer',
 
91
  'fields'=>array(
92
  array(
93
  'type' =>'text',
@@ -97,6 +97,22 @@ return array(
97
  'default' =>'Heading',
98
  'content_type'=>'html',
99
  ),
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
100
  array(
101
  'type' =>'textarea',
102
  'name' =>"ass_desc",
@@ -123,7 +139,7 @@ return array(
123
  'front_template'=>
124
  '<section {{if_condition_open_accordion==1}}
125
  expanded{{ifend_condition_open_accordion_1}}>
126
- <h5 class="acc-lbl">{{acc_title}}</h5>
127
  <div class="acc-desc">{{ass_desc}}</div>
128
  </section>'
129
  ),
4
  $output =
5
  '<amp-accordion {{if_id}}id="{{id}}"{{ifend_id}} {{if_user_class}}class="{{user_class}}{{ifend_user_class}}">{{repeater}}</amp-accordion>';
6
  $css = '
7
+ {{module-class}}.accordion-mod{margin:{{margin_css}};padding:{{padding_css}};}
8
  amp-accordion section[expanded] .show-more {display: none;}
9
  amp-accordion section:not([expanded]) .show-less {display: none;}
10
+ {{module-class}}.accordion-mod .acc-lbl{background: none;border: 0;padding: 0;margin:10px 0px 15px 0;color: {{acc_color_picker}};font-size: 22px;line-height: 1.5em;font-weight: normal; }
11
+ {{module-class}}.accordion-mod .acc-desc{margin-bottom:0;margin:-5px 0px 20px 23px;padding: 0;color:#666;font-size: 14px;line-height: 1.5em;}';
12
+ $front_css = '.accordion-mod {{acc_head_type}}:before{content: "+";font-size: 24px;color: #999;margin-right: 10px;position: relative;top: 1px;}
13
+ .accordion-mod {{acc_head_type}}:hover{color:#000;}
14
+ .accordion-mod section[expanded] {{acc_head_type}}:before{content:"-"}';
 
15
  return array(
16
  'label' =>'Accordion',
17
  'name' =>'accordion-mod',
87
  'front_common_css'=>'',
88
  'repeater'=>array(
89
  'tab'=>'customizer',
90
+ 'front_css'=> $front_css,
91
  'fields'=>array(
92
  array(
93
  'type' =>'text',
97
  'default' =>'Heading',
98
  'content_type'=>'html',
99
  ),
100
+ array(
101
+ 'type' =>'select',
102
+ 'name' =>'acc_head_type',
103
+ 'label' =>"Header Type",
104
+ 'tab' =>'customizer',
105
+ 'default' =>'h5',
106
+ 'options_details'=>array(
107
+ 'h1' =>'H1',
108
+ 'h2' =>'H2',
109
+ 'h3' =>'H3',
110
+ 'h4' =>'H4',
111
+ 'h5' =>'H5',
112
+ 'h6' =>'H6',
113
+ ),
114
+ 'content_type'=>'html',
115
+ ),
116
  array(
117
  'type' =>'textarea',
118
  'name' =>"ass_desc",
139
  'front_template'=>
140
  '<section {{if_condition_open_accordion==1}}
141
  expanded{{ifend_condition_open_accordion_1}}>
142
+ <{{acc_head_type}} class="acc-lbl">{{acc_title}}</{{acc_head_type}}>
143
  <div class="acc-desc">{{ass_desc}}</div>
144
  </section>'
145
  ),
pagebuilder/modules/list-mod-module.php CHANGED
@@ -5,10 +5,10 @@ $output = '
5
  <div {{if_id}}id="{{id}}"{{ifend_id}} class="{{user_class}}">{{repeater}}</div>
6
  ';
7
  $css = '
8
- .list-mod{display: flex;flex-direction: column;flex: 1 0 25%;justify-content: space-between;margin:{{margin_css}};}
9
- .list-mod .li-mod .ico-pic{font-size:{{ico-size}};display:inline-block;color:{{ico_color_picker}};padding-right: 10px;position: relative;top: 2px;}
10
- .list-mod .li-txt{font-size:{{text-size}};line-height:1.5;color:{{text_color_picker}};}
11
- .li-mod{margin-bottom:15px;}
12
  ';
13
  return array(
14
  'label' =>'Lists',
5
  <div {{if_id}}id="{{id}}"{{ifend_id}} class="{{user_class}}">{{repeater}}</div>
6
  ';
7
  $css = '
8
+ {{module-class}}.list-mod{display: flex;flex-direction: column;flex: 1 0 25%;justify-content: space-between;margin:{{margin_css}};}
9
+ {{module-class}}.list-mod .li-mod .ico-pic{font-size:{{ico-size}};display:inline-block;color:{{ico_color_picker}};padding-right: 10px;position: relative;top: 2px;}
10
+ {{module-class}}.list-mod .li-txt{font-size:{{text-size}};line-height:1.5;color:{{text_color_picker}};}
11
+ {{module-class}}.li-mod{margin-bottom:15px;}
12
  ';
13
  return array(
14
  'label' =>'Lists',
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: 5.4.2
7
- Stable tag: 1.0.61.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -190,6 +190,17 @@ You can contact us from [here](https://ampforwp.com/contact/)
190
 
191
  == Changelog ==
192
 
 
 
 
 
 
 
 
 
 
 
 
193
  = 1.0.61.2 (5th August 2020) =
194
  * Fixed: Removed Helpscout Beacon from Options Panel #4682
195
 
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: 5.5
7
+ Stable tag: 1.0.62
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
190
 
191
  == Changelog ==
192
 
193
+ = 1.0.62 (15th August 2020) =
194
+ * Improvement: Added Yoast Local SEO plugin compatibility #4170
195
+ * Improvement: Added option for changing the tags for the accordion module in AMP Page Builder #4208
196
+ * Improvement: Added option for showing primary category of Yoast #4495
197
+ * Improvement: Added condition for adding infinite scroll in AMP Woocommerce #4673
198
+ * Improvement: Added excerpt option in in-content related posts #3981
199
+ * Fixed: AMP not working on the Homepage with WP Ultimate recipe plugin #4538
200
+ * Fixed: CSS overiding issue for the list and accourdion modules in AMP Page Builder #4674
201
+ * Fixed: Alignment issue on homepage in design one #4676
202
+ * Fixed: Debug Errors #4671
203
+
204
  = 1.0.61.2 (5th August 2020) =
205
  * Fixed: Removed Helpscout Beacon from Options Panel #4682
206
 
templates/design-manager/design-1/footer.php CHANGED
@@ -14,6 +14,7 @@ wp_reset_postdata(); ?>
14
  $sanitized_sidebar = ampforwp_sidebar_content_sanitizer('swift-footer-widget-area');
15
  if ( $sanitized_sidebar) {
16
  $sidebar_output = $sanitized_sidebar->get_amp_content();
 
17
  $sidebar_output = apply_filters('ampforwp_modify_sidebars_content',$sidebar_output);
18
  $sidebar_output = preg_replace_callback('/<form(.*?)>(.*?)<\/form>/s', function($match){
19
  if(strpos($match[1], 'target=') === false){
14
  $sanitized_sidebar = ampforwp_sidebar_content_sanitizer('swift-footer-widget-area');
15
  if ( $sanitized_sidebar) {
16
  $sidebar_output = $sanitized_sidebar->get_amp_content();
17
+ $sidebar_output = ampforwp_show_yoast_seo_local_map($sidebar_output);
18
  $sidebar_output = apply_filters('ampforwp_modify_sidebars_content',$sidebar_output);
19
  $sidebar_output = preg_replace_callback('/<form(.*?)>(.*?)<\/form>/s', function($match){
20
  if(strpos($match[1], 'target=') === false){
templates/design-manager/design-1/style.php CHANGED
@@ -157,7 +157,7 @@ echo sanitize_text_field($fontFamily); // secondary font family ends here ?>
157
 
158
  .amp-wp-header {background-color: <?php echo ampforwp_sanitize_color( $header_bg_clr ); ?>;}
159
  .amp-wp-header .ampforwp-logo-area {color: <?php echo sanitize_hex_color( $header_color ); ?>;font-size: 1em;font-weight: 400;margin: 0 auto;max-width: calc(840px - 32px);padding: .875em 16px;position: relative;} .amp-wp-header .amp-wp-site-icon {background-color: <?php echo sanitize_hex_color( $header_color ); ?>;border: 1px solid <?php echo sanitize_hex_color( $header_color ); ?>;border-radius: 50%;position: absolute;right: 18px;top: 10px;}
160
- <?php if( !ampforwp_woocommerce_conditional_check() && !checkAMPforPageBuilderStatus(ampforwp_get_the_ID()) ) { ?>
161
  .amp-wp-article {color: <?php echo sanitize_hex_color( $text_color ); ?>;font-weight: 400;margin: 1.5em auto;max-width: 840px;overflow-wrap: break-word;word-wrap: break-word;} .amp-wp-article-header {align-items: center;align-content: stretch;display: flex;flex-wrap: wrap;justify-content: space-between;margin: 1.5em 16px 1.5em;}
162
  .amp-wp-title {color: <?php echo sanitize_hex_color( $text_color ); ?>;display: block;flex: 1 0 100%;font-weight: 900;font-size:1.5em;margin: 0;width: 100%;}.amp-wp-meta {color: <?php echo sanitize_hex_color( $muted_text_color ); ?>;display: inline-block;flex: 2 1 50%;font-size: .875em;line-height: 1.7em;margin: 0;padding: 0;}.ampforwp-meta-info{margin-top: 0px;}.amp-wp-article-header .amp-wp-meta:last-of-type {text-align: right;float:right;display:initial}.amp-wp-article-header .amp-wp-meta:first-of-type {text-align: left;}.amp-wp-byline amp-img,.amp-wp-byline .amp-wp-author {display: inline-block;vertical-align: middle;}.amp-wp-byline amp-img {border: 1px solid <?php echo sanitize_hex_color( $link_color ); ?>;border-radius: 50%;position: relative;margin-right: 6px;}.amp-wp-posted-on {text-align: right;}.hide-meta-info{ display: none; }
163
  .amp-wp-article-featured-image {margin: 1.5em 16px 1.5em;text-align:center;}.amp-wp-article-featured-image amp-img {margin: 0 auto;}.amp-wp-article-featured-image.wp-caption .wp-caption-text, .ampforwp-gallery-item .wp-caption-text {margin: 0 18px;}.amp-wp-frontpage .the_content {padding: 10px;}
@@ -181,7 +181,7 @@ echo sanitize_text_field($fontFamily); // secondary font family ends here ?>
181
  .amp-wp-home .amp-wp-meta{margin:5px 0}
182
  .amp-wp-home .amp-wp-content p{display:inline-block;width:100%}.ampforwp-custom-index .amp-wp-title a {text-decoration: none;color: <?php echo sanitize_hex_color( $text_color ); ?>;}
183
  .amp-wp-meta{display:flex}.amp-wp-posted-on{display:initial}
184
- <?php if(!checkAMPforPageBuilderStatus(ampforwp_get_the_ID())){ ?>
185
  #pagination .next,#pagination .prev{display:inline-block}.ampforwp-custom-index .amp-wp-content{margin-bottom:30px}.pagination-holder{margin:1.5em 16px}#pagination .next{float:right}.amp-wp-home .amp-wp-content p{display:inline}.home-post-image{float:right;margin:0 0 10px 20px}.amp-wp-article-content amp-img{max-width:100%}.amp-wp-meta.amp-wp-tax-category,.amp-wp-meta.amp-wp-tax-tag{margin:0}.amp-wp-meta.amp-wp-tax-tag{display:initial}
186
  <?php } // AMP Woocommerce CSS Ends ?>
187
  .the_content small{font-size:11px;line-height:1.2;color:#111;margin-bottom: 5px;display: inline-block;}
157
 
158
  .amp-wp-header {background-color: <?php echo ampforwp_sanitize_color( $header_bg_clr ); ?>;}
159
  .amp-wp-header .ampforwp-logo-area {color: <?php echo sanitize_hex_color( $header_color ); ?>;font-size: 1em;font-weight: 400;margin: 0 auto;max-width: calc(840px - 32px);padding: .875em 16px;position: relative;} .amp-wp-header .amp-wp-site-icon {background-color: <?php echo sanitize_hex_color( $header_color ); ?>;border: 1px solid <?php echo sanitize_hex_color( $header_color ); ?>;border-radius: 50%;position: absolute;right: 18px;top: 10px;}
160
+ <?php if( !ampforwp_woocommerce_conditional_check() && !checkAMPforPageBuilderStatus(ampforwp_get_the_ID()) || ampforwp_is_home()) { ?>
161
  .amp-wp-article {color: <?php echo sanitize_hex_color( $text_color ); ?>;font-weight: 400;margin: 1.5em auto;max-width: 840px;overflow-wrap: break-word;word-wrap: break-word;} .amp-wp-article-header {align-items: center;align-content: stretch;display: flex;flex-wrap: wrap;justify-content: space-between;margin: 1.5em 16px 1.5em;}
162
  .amp-wp-title {color: <?php echo sanitize_hex_color( $text_color ); ?>;display: block;flex: 1 0 100%;font-weight: 900;font-size:1.5em;margin: 0;width: 100%;}.amp-wp-meta {color: <?php echo sanitize_hex_color( $muted_text_color ); ?>;display: inline-block;flex: 2 1 50%;font-size: .875em;line-height: 1.7em;margin: 0;padding: 0;}.ampforwp-meta-info{margin-top: 0px;}.amp-wp-article-header .amp-wp-meta:last-of-type {text-align: right;float:right;display:initial}.amp-wp-article-header .amp-wp-meta:first-of-type {text-align: left;}.amp-wp-byline amp-img,.amp-wp-byline .amp-wp-author {display: inline-block;vertical-align: middle;}.amp-wp-byline amp-img {border: 1px solid <?php echo sanitize_hex_color( $link_color ); ?>;border-radius: 50%;position: relative;margin-right: 6px;}.amp-wp-posted-on {text-align: right;}.hide-meta-info{ display: none; }
163
  .amp-wp-article-featured-image {margin: 1.5em 16px 1.5em;text-align:center;}.amp-wp-article-featured-image amp-img {margin: 0 auto;}.amp-wp-article-featured-image.wp-caption .wp-caption-text, .ampforwp-gallery-item .wp-caption-text {margin: 0 18px;}.amp-wp-frontpage .the_content {padding: 10px;}
181
  .amp-wp-home .amp-wp-meta{margin:5px 0}
182
  .amp-wp-home .amp-wp-content p{display:inline-block;width:100%}.ampforwp-custom-index .amp-wp-title a {text-decoration: none;color: <?php echo sanitize_hex_color( $text_color ); ?>;}
183
  .amp-wp-meta{display:flex}.amp-wp-posted-on{display:initial}
184
+ <?php if(ampforwp_is_home() || !checkAMPforPageBuilderStatus(ampforwp_get_the_ID())){ ?>
185
  #pagination .next,#pagination .prev{display:inline-block}.ampforwp-custom-index .amp-wp-content{margin-bottom:30px}.pagination-holder{margin:1.5em 16px}#pagination .next{float:right}.amp-wp-home .amp-wp-content p{display:inline}.home-post-image{float:right;margin:0 0 10px 20px}.amp-wp-article-content amp-img{max-width:100%}.amp-wp-meta.amp-wp-tax-category,.amp-wp-meta.amp-wp-tax-tag{margin:0}.amp-wp-meta.amp-wp-tax-tag{display:initial}
186
  <?php } // AMP Woocommerce CSS Ends ?>
187
  .the_content small{font-size:11px;line-height:1.2;color:#111;margin-bottom: 5px;display: inline-block;}
templates/design-manager/design-2/footer.php CHANGED
@@ -14,6 +14,7 @@ global $redux_builder_amp;
14
  $sanitized_sidebar = ampforwp_sidebar_content_sanitizer('swift-footer-widget-area');
15
  if ( $sanitized_sidebar) {
16
  $sidebar_output = $sanitized_sidebar->get_amp_content();
 
17
  $sidebar_output = apply_filters('ampforwp_modify_sidebars_content',$sidebar_output);
18
  $sidebar_output = preg_replace_callback('/<form(.*?)>(.*?)<\/form>/s', function($match){
19
  if(strpos($match[1], 'target=') === false){
14
  $sanitized_sidebar = ampforwp_sidebar_content_sanitizer('swift-footer-widget-area');
15
  if ( $sanitized_sidebar) {
16
  $sidebar_output = $sanitized_sidebar->get_amp_content();
17
+ $sidebar_output = ampforwp_show_yoast_seo_local_map($sidebar_output);
18
  $sidebar_output = apply_filters('ampforwp_modify_sidebars_content',$sidebar_output);
19
  $sidebar_output = preg_replace_callback('/<form(.*?)>(.*?)<\/form>/s', function($match){
20
  if(strpos($match[1], 'target=') === false){
templates/design-manager/design-3/footer.php CHANGED
@@ -14,6 +14,7 @@ global $redux_builder_amp;
14
  $sanitized_sidebar = ampforwp_sidebar_content_sanitizer('swift-footer-widget-area');
15
  if ( $sanitized_sidebar) {
16
  $sidebar_output = $sanitized_sidebar->get_amp_content();
 
17
  $sidebar_output = apply_filters('ampforwp_modify_sidebars_content',$sidebar_output);
18
  $sidebar_output = preg_replace_callback('/<form(.*?)>(.*?)<\/form>/s', function($match){
19
  if(strpos($match[1], 'target=') === false){
14
  $sanitized_sidebar = ampforwp_sidebar_content_sanitizer('swift-footer-widget-area');
15
  if ( $sanitized_sidebar) {
16
  $sidebar_output = $sanitized_sidebar->get_amp_content();
17
+ $sidebar_output = ampforwp_show_yoast_seo_local_map($sidebar_output);
18
  $sidebar_output = apply_filters('ampforwp_modify_sidebars_content',$sidebar_output);
19
  $sidebar_output = preg_replace_callback('/<form(.*?)>(.*?)<\/form>/s', function($match){
20
  if(strpos($match[1], 'target=') === false){
templates/design-manager/swift/footer.php CHANGED
@@ -19,6 +19,7 @@ if ( isset($redux_builder_amp['footer-type']) && '1' == $redux_builder_amp['foot
19
  $sanitized_sidebar = ampforwp_sidebar_content_sanitizer('swift-footer-widget-area');
20
  if ( $sanitized_sidebar) {
21
  $sidebar_output = $sanitized_sidebar->get_amp_content();
 
22
  $sidebar_output = apply_filters('ampforwp_modify_sidebars_content',$sidebar_output);
23
  $sidebar_output = preg_replace_callback('/<form(.*?)>(.*?)<\/form>/s', function($match){
24
  if(strpos($match[1], 'target=') === false){
19
  $sanitized_sidebar = ampforwp_sidebar_content_sanitizer('swift-footer-widget-area');
20
  if ( $sanitized_sidebar) {
21
  $sidebar_output = $sanitized_sidebar->get_amp_content();
22
+ $sidebar_output = ampforwp_show_yoast_seo_local_map($sidebar_output);
23
  $sidebar_output = apply_filters('ampforwp_modify_sidebars_content',$sidebar_output);
24
  $sidebar_output = preg_replace_callback('/<form(.*?)>(.*?)<\/form>/s', function($match){
25
  if(strpos($match[1], 'target=') === false){
templates/design-manager/swift/style.php CHANGED
@@ -2498,4 +2498,12 @@ if(ampforwp_get_setting('amp-sticky-header') == '1' && ampforwp_get_setting('hea
2498
  overflow: initial;
2499
  position: initial;
2500
  }
2501
- <?php } ?>
 
 
 
 
 
 
 
 
2498
  overflow: initial;
2499
  position: initial;
2500
  }
2501
+ <?php }
2502
+ if(true == ampforwp_get_setting('ampforwp-cats-single-primary')){?>
2503
+ .amp-category span , .amp-category span:after{
2504
+ display: none;
2505
+ }
2506
+ .amp-category span.amp-cat.primary {
2507
+ display: block;
2508
+ }
2509
+ <?php }
templates/features.php CHANGED
@@ -325,7 +325,6 @@ define('AMPFORWP_COMMENTS_PER_PAGE', ampforwp_define_comments_number() );
325
  //dont Echo anything
326
  } else {
327
  $supported_types = ampforwp_get_all_post_types();
328
-
329
  $supported_types = apply_filters('get_amp_supported_post_types',$supported_types);
330
 
331
  $type = get_post_type();
@@ -4943,14 +4942,16 @@ function ampforwp_inline_related_posts(){
4943
  }
4944
  $inline_related_posts .='<div class="related_link">';
4945
  $inline_related_posts .='<a href="'.esc_url( $related_post_permalink ).'">'.get_the_title().'</a>';
4946
- if( has_excerpt() ){
4947
- $content ='<p>'.get_the_excerpt().'</p>';
4948
- }else{
4949
- $content ='<p>'.get_the_content().'</p>';
4950
- }
4951
- $inline_related_posts .= '<p>'. wp_trim_words( strip_shortcodes( $content ) , 15 ).'</p>
4952
- </div>
4953
- </li>';
 
 
4954
  }
4955
  $inline_related_posts .= '</ol>
4956
  </div>
325
  //dont Echo anything
326
  } else {
327
  $supported_types = ampforwp_get_all_post_types();
 
328
  $supported_types = apply_filters('get_amp_supported_post_types',$supported_types);
329
 
330
  $type = get_post_type();
4942
  }
4943
  $inline_related_posts .='<div class="related_link">';
4944
  $inline_related_posts .='<a href="'.esc_url( $related_post_permalink ).'">'.get_the_title().'</a>';
4945
+ if(ampforwp_get_setting('ampforwp-incontent-related-posts-excerpt')==1){
4946
+ if( has_excerpt() ){
4947
+ $content ='<p>'.get_the_excerpt().'</p>';
4948
+ }else{
4949
+ $content ='<p>'.get_the_content().'</p>';
4950
+ }
4951
+ $inline_related_posts .= '<p>'. wp_trim_words( strip_shortcodes( $content ) , 15 ).'</p>';
4952
+ }
4953
+ $inline_related_posts .= '</div>
4954
+ </li>';
4955
  }
4956
  $inline_related_posts .= '</ol>
4957
  </div>