From b94207f8610a2eb62ff199dc29bf772db751bc61 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Thu, 8 Dec 2016 11:50:41 +0530 Subject: [PATCH 01/37] fixed issue #244 #251 --- templates/design-manager/design-2/elements/content.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/design-manager/design-2/elements/content.php b/templates/design-manager/design-2/elements/content.php index 25d05aa89..dff85dabb 100644 --- a/templates/design-manager/design-2/elements/content.php +++ b/templates/design-manager/design-2/elements/content.php @@ -1,9 +1,9 @@
- + get( 'post_amp_content' ); // amphtml content; no kses ?> - +
@@ -11,13 +11,13 @@
From bfc790a8c36c325cec20ec0092d41b7b122e0d30 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Thu, 8 Dec 2016 12:09:15 +0530 Subject: [PATCH 02/37] issue fixed #249 --- templates/design-manager/design-1/style.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/design-manager/design-1/style.php b/templates/design-manager/design-1/style.php index 389da5ed0..613caa324 100644 --- a/templates/design-manager/design-1/style.php +++ b/templates/design-manager/design-1/style.php @@ -767,9 +767,11 @@ function ampforwp_additional_style_input( $amp_template ) { .amp-wp-tax-tag a:last-child:after { content: ' '; } - + pre { white-space: pre-wrap; } - + + /* Custom Style Code */ + From 93183cfd53fa755227c344c2358232bdb80a9fdf Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Thu, 8 Dec 2016 13:53:45 +0530 Subject: [PATCH 03/37] issue fixed #260 #264 Additional : 1. Enhanced the translation panel by adding Textare from Redux --- includes/options/options-init.php | 4 +- .../inc/fields/textarea/field_textarea.php | 79 +++++++++++++++++++ templates/design-manager/design-1/footer.php | 10 ++- templates/design-manager/design-2/footer.php | 9 ++- 4 files changed, 95 insertions(+), 7 deletions(-) create mode 100644 includes/options/redux-framework/inc/fields/textarea/field_textarea.php diff --git a/includes/options/options-init.php b/includes/options/options-init.php index b0faca595..32e3c4f7a 100644 --- a/includes/options/options-init.php +++ b/includes/options/options-init.php @@ -864,9 +864,9 @@ ), array( 'id' => 'amp-translator-footer-text', - 'type' => 'text', + 'type' => 'textarea', 'title' => __('Footer', 'redux-framework-demo'), - 'default' => 'Footer', + 'default' => 'Powered By WordPress', 'placeholder'=>'write here' ), array( diff --git a/includes/options/redux-framework/inc/fields/textarea/field_textarea.php b/includes/options/redux-framework/inc/fields/textarea/field_textarea.php new file mode 100644 index 000000000..72e2d0b2e --- /dev/null +++ b/includes/options/redux-framework/inc/fields/textarea/field_textarea.php @@ -0,0 +1,79 @@ +field['test'] This is cool. + * @param string|boolean $field[default] Default value for this field. + * @return Test + * @see ParentClass + * @since Redux 3.0.9 + * @todo Still need to fix this! + * @var string cool + * @var int notcool + * @param string[] $options { + * @type boolean $required Whether this element is required + * @type string $label The display name for this element + */ + +// Exit if accessed directly + if ( ! defined( 'ABSPATH' ) ) { + exit; + } + + if ( ! class_exists( 'ReduxFramework_textarea' ) ) { + class ReduxFramework_textarea { + + /** + * Field Constructor. + * + * @param $value Constructed by Redux class. Based on the passing in $field['defaults'] value and what is stored in the database. + * @param $parent ReduxFramework object is passed for easier pointing. + * + * @since ReduxFramework 1.0.0 + * @type string $field [test] Description. Default . Accepts , . + */ + function __construct( $field = array(), $value = '', $parent ) { + $this->parent = $parent; + $this->field = $field; + $this->value = $value; + } + + /** + * Field Render Function. + * Takes the vars and outputs the HTML for the field in the settings + * + * @since ReduxFramework 1.0.0 + * + * @param array $arr (See above) + * + * @return Object A new editor object. + **/ + function render() { + + $this->field['placeholder'] = isset( $this->field['placeholder'] ) ? $this->field['placeholder'] : ""; + $this->field['rows'] = isset( $this->field['rows'] ) ? $this->field['rows'] : 6; + $readonly = ( isset( $this->field['readonly'] ) && $this->field['readonly']) ? ' readonly="readonly"' : ''; + // The $this->field variables are already escaped in the ReduxFramework Class. + ?> + +

get( 'blog_name' ) ); ?>

-

- +

+

- + +
diff --git a/templates/design-manager/design-2/footer.php b/templates/design-manager/design-2/footer.php index d6e692669..95896fe43 100644 --- a/templates/design-manager/design-2/footer.php +++ b/templates/design-manager/design-2/footer.php @@ -1,4 +1,4 @@ -">

-

+

+ +

From 76bba1be716263bb8e0a2e752e84a86d34d84ad5 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Thu, 8 Dec 2016 16:47:01 +0530 Subject: [PATCH 04/37] issue fixed #267 finished for Design 1 --- includes/options/options-init.php | 7 ++++++ .../design-manager/design-1/header-bar.php | 24 +++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/includes/options/options-init.php b/includes/options/options-init.php index 32e3c4f7a..d2aee6532 100644 --- a/includes/options/options-init.php +++ b/includes/options/options-init.php @@ -302,6 +302,13 @@ 'subtitle' => __('Enable or Disable AMP on all Pages', 'redux-framework-demo'), 'default' => 1, ), + array( + 'id' =>'amp-on-off-support-for-non-amp-home-page', + 'type' => 'switch', + 'title' => __('Non-AMP Home Page', 'redux-framework-demo'), + 'subtitle' => __('Enable or Disable Non-AMP on Home Page', 'redux-framework-demo'), + 'default' => 0, + ), // array( // 'id' => 'amp-design-selector', // 'type' => 'select', diff --git a/templates/design-manager/design-1/header-bar.php b/templates/design-manager/design-1/header-bar.php index 730132a63..b314fe349 100644 --- a/templates/design-manager/design-1/header-bar.php +++ b/templates/design-manager/design-1/header-bar.php @@ -1,17 +1,31 @@
+ + + + + + - get( 'blog_name' ) ); + echo esc_html( $this->get( 'blog_name' ) ); } ?> - + + + + get( 'site_icon_url' ); if ( $site_icon_url ) : ?> @@ -22,13 +36,13 @@ - +
- + From 8f972f3b99a509a8a0b50364fb044b03d0d4f59c Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Thu, 8 Dec 2016 16:50:05 +0530 Subject: [PATCH 05/37] issue fixed #267 done even for Design 2 --- templates/design-manager/design-2/header-bar.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/templates/design-manager/design-2/header-bar.php b/templates/design-manager/design-2/header-bar.php index 24bdee6c6..28ff2fa60 100644 --- a/templates/design-manager/design-2/header-bar.php +++ b/templates/design-manager/design-2/header-bar.php @@ -1,9 +1,14 @@ -
+
- + From 6aafeb561175d3a1bb46eb6f33fb3bad420ef6fb Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Thu, 8 Dec 2016 18:25:40 +0530 Subject: [PATCH 06/37] issue fixed #259 --- .../design-manager/design-1/elements/meta-info.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/templates/design-manager/design-1/elements/meta-info.php b/templates/design-manager/design-1/elements/meta-info.php index 8ed810d16..dc1d566dc 100644 --- a/templates/design-manager/design-1/elements/meta-info.php +++ b/templates/design-manager/design-1/elements/meta-info.php @@ -1,11 +1,17 @@
get( 'post_author' ); ?> - - user_email, array( 'size' => 24 ) ); ?> + + user_email); + $token = strtok($string, " "); + $token = strtok(" "); + $token = strtok(" "); + ?>
- + " width="24" height="24" layout="fixed"> display_name ); ?>
From 147677d8e00369ec57740515a0a076f506be6748 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Fri, 9 Dec 2016 02:04:01 +0530 Subject: [PATCH 07/37] plugin Number --- accelerated-moblie-pages.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accelerated-moblie-pages.php b/accelerated-moblie-pages.php index a63d7268d..9095150a8 100644 --- a/accelerated-moblie-pages.php +++ b/accelerated-moblie-pages.php @@ -3,7 +3,7 @@ Plugin Name: Accelerated Mobile Pages Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/ Description: AMP for WP - Accelerated Mobile Pages for WordPress -Version: 0.9 +Version: 0.9.1 Author: Ahmed Kaludi, Mohammed Kaludi Author URI: http://ampforwp.com/ Donate link: https://www.paypal.me/Kaludi/5 @@ -26,7 +26,7 @@ function ampforwp_add_custom_post_support() { define('AMPFORWP_PLUGIN_DIR', plugin_dir_path( __FILE__ )); define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images'); -define('AMPFORWP_VERSION','0.8.9'); +define('AMPFORWP_VERSION','0.9.1'); /* * Load Files only in the backend @@ -91,4 +91,4 @@ function ampforwp_plugin_init() { new Ampforwp_Init; } } -add_action('init','ampforwp_plugin_init',9); \ No newline at end of file +add_action('init','ampforwp_plugin_init',9); From 7e9f8ddbecdbdff41d43150c95b315e8584e03b4 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Fri, 9 Dec 2016 14:03:42 +0530 Subject: [PATCH 08/37] issue fixed #268 --- templates/features.php | 44 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/templates/features.php b/templates/features.php index a7209e90d..35e0b7e1d 100644 --- a/templates/features.php +++ b/templates/features.php @@ -33,6 +33,7 @@ 23. The analytics tag appears more than once in the document. This will soon be an error 24. Seperate Sticky Single Social Icons 25. Yoast meta Support + 26. Extending Title Tagand De-Hooking the Standard one from AMP */ // Adding AMP-related things to the main theme global $redux_builder_amp; @@ -455,11 +456,17 @@ function ampforwp_the_content_filter( $content ) { $content = preg_replace('##i', '', $content); $content = preg_replace('##i', '', $content); $content = preg_replace('/href="javascript:void*/', ' ', $content); + $content = preg_replace('/]*>.*?<\/script>/i', '', $content); //for removing attributes within html tags $content = preg_replace('/(<[^>]+) onclick=".*?"/', '$1', $content); $content = preg_replace('/(<[^>]+) rel=".*?"/', '$1', $content); $content = preg_replace('/(<[^>]+) date/', '$1', $content); + //removing scripts and rel="nofollow" from Body and from divs + //issue #268 + $content = str_replace(' rel="nofollow"',"",$content); + $content = preg_replace('/]*>.*?<\/script>/i', '', $content); + // $content = preg_replace('/' ); -// } - } +// } + } } if ( is_plugin_active( 'wordpress-seo/wp-seo.php' ) ) { add_action( 'amp_post_template_head', 'ampforwp_custom_yoast_meta' ); -} \ No newline at end of file +} + +//26. Extending Title Tagand De-Hooking the Standard one from AMP +add_action('amp_post_template_include_single','remove_this'); +function remove_this(){ + remove_action('amp_post_template_head','amp_post_template_add_title'); + add_action('amp_post_template_head','ampforwp_custom_title_tag'); + + function ampforwp_custom_title_tag(){ + global $post; + ?> + + <?php + global $redux_builder_amp; + if(is_single()){ + global $post; + $titl = $post->post_title; + echo $titl; + } elseif ($redux_builder_amp['amp-frontpage-select-option']==0 && (is_front_page() || is_archive())) { + echo bloginfo('name'); + }elseif($redux_builder_amp['amp-frontpage-select-option']){ + // global $post; + echo get_query_var('pagename'); + }elseif (is_home()) { + echo get_query_var('pagename'); + } + ?> + + + Date: Fri, 9 Dec 2016 14:04:20 +0530 Subject: [PATCH 09/37] issue fixed #224 --- .../options/redux-framework/inc/browser.php | 90 +++++++++---------- .../inc/fields/editor/field_editor_c.php | 0 .../preg_replace/validation_preg_replace.php | 4 +- 3 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 includes/options/redux-framework/inc/fields/editor/field_editor_c.php diff --git a/includes/options/redux-framework/inc/browser.php b/includes/options/redux-framework/inc/browser.php index 8a869b0a2..12e2eb1c9 100644 --- a/includes/options/redux-framework/inc/browser.php +++ b/includes/options/redux-framework/inc/browser.php @@ -110,7 +110,7 @@ class Browser const OPERATING_SYSTEM_UNKNOWN = 'unknown'; - public function Browser($userAgent = "") + public function __construct($userAgent = "") { $this->reset(); if ($userAgent != "") { @@ -260,8 +260,8 @@ public function isRobot() * Is the browser from facebook? * @return boolean True if the browser is from facebook otherwise false */ - public function isFacebook() - { + public function isFacebook() + { return $this->_is_facebook; } @@ -305,9 +305,9 @@ protected function setRobot($value = true) * Set the Browser to be a Facebook request * @param boolean $value is the browser a robot or not */ - protected function setFacebook($value = true) - { - $this->_is_facebook = $value; + protected function setFacebook($value = true) + { + $this->_is_facebook = $value; } /** @@ -420,7 +420,7 @@ protected function checkBrowsers() $this->checkBrowserLynx() || $this->checkBrowserShiretoko() || $this->checkBrowserIceCat() || - $this->checkBrowserIceweasel() || + $this->checkBrowserIceweasel() || $this->checkBrowserW3CValidator() || $this->checkBrowserMozilla() /* Mozilla is such an open standard that you must check it last */ ); @@ -502,7 +502,7 @@ protected function checkBrowserMSNBot() } return false; } - + /** * Determine if the browser is the BingBot or not (last updated 1.9) * @return boolean True if the browser is the BingBot otherwise false @@ -1099,10 +1099,10 @@ protected function checkForFacebookIos() * Detect Version for the Safari browser on iOS devices * @return boolean True if it detects the version correctly otherwise false */ - protected function getSafariVersionOnIos() + protected function getSafariVersionOnIos() { $aresult = explode('/',stristr($this->_agent,'Version')); - if( isset($aresult[1]) ) + if( isset($aresult[1]) ) { $aversion = explode(' ',$aresult[1]); $this->setVersion($aversion[0]); @@ -1115,10 +1115,10 @@ protected function getSafariVersionOnIos() * Detect Version for the Chrome browser on iOS devices * @return boolean True if it detects the version correctly otherwise false */ - protected function getChromeVersionOnIos() + protected function getChromeVersionOnIos() { $aresult = explode('/',stristr($this->_agent,'CriOS')); - if( isset($aresult[1]) ) + if( isset($aresult[1]) ) { $aversion = explode(' ',$aresult[1]); $this->setVersion($aversion[0]); @@ -1209,71 +1209,71 @@ protected function checkBrowserAndroid() */ protected function checkPlatform() { - if (stripos($this->_agent, 'windows') !== false) + if (stripos($this->_agent, 'windows') !== false) { $this->_platform = self::PLATFORM_WINDOWS; - } - else if (stripos($this->_agent, 'iPad') !== false) + } + else if (stripos($this->_agent, 'iPad') !== false) { $this->_platform = self::PLATFORM_IPAD; - } - else if (stripos($this->_agent, 'iPod') !== false) + } + else if (stripos($this->_agent, 'iPod') !== false) { $this->_platform = self::PLATFORM_IPOD; - } - else if (stripos($this->_agent, 'iPhone') !== false) + } + else if (stripos($this->_agent, 'iPhone') !== false) { $this->_platform = self::PLATFORM_IPHONE; - } - elseif (stripos($this->_agent, 'mac') !== false) + } + elseif (stripos($this->_agent, 'mac') !== false) { $this->_platform = self::PLATFORM_APPLE; - } - elseif (stripos($this->_agent, 'android') !== false) + } + elseif (stripos($this->_agent, 'android') !== false) { $this->_platform = self::PLATFORM_ANDROID; - } - elseif (stripos($this->_agent, 'linux') !== false) + } + elseif (stripos($this->_agent, 'linux') !== false) { $this->_platform = self::PLATFORM_LINUX; - } - else if (stripos($this->_agent, 'Nokia') !== false) + } + else if (stripos($this->_agent, 'Nokia') !== false) { $this->_platform = self::PLATFORM_NOKIA; - } - else if (stripos($this->_agent, 'BlackBerry') !== false) + } + else if (stripos($this->_agent, 'BlackBerry') !== false) { $this->_platform = self::PLATFORM_BLACKBERRY; - } - elseif (stripos($this->_agent, 'FreeBSD') !== false) + } + elseif (stripos($this->_agent, 'FreeBSD') !== false) { $this->_platform = self::PLATFORM_FREEBSD; - } - elseif (stripos($this->_agent, 'OpenBSD') !== false) + } + elseif (stripos($this->_agent, 'OpenBSD') !== false) { $this->_platform = self::PLATFORM_OPENBSD; - } - elseif (stripos($this->_agent, 'NetBSD') !== false) + } + elseif (stripos($this->_agent, 'NetBSD') !== false) { $this->_platform = self::PLATFORM_NETBSD; - } - elseif (stripos($this->_agent, 'OpenSolaris') !== false) + } + elseif (stripos($this->_agent, 'OpenSolaris') !== false) { $this->_platform = self::PLATFORM_OPENSOLARIS; - } - elseif (stripos($this->_agent, 'SunOS') !== false) + } + elseif (stripos($this->_agent, 'SunOS') !== false) { $this->_platform = self::PLATFORM_SUNOS; - } - elseif (stripos($this->_agent, 'OS\/2') !== false) + } + elseif (stripos($this->_agent, 'OS\/2') !== false) { $this->_platform = self::PLATFORM_OS2; - } - elseif (stripos($this->_agent, 'BeOS') !== false) + } + elseif (stripos($this->_agent, 'BeOS') !== false) { $this->_platform = self::PLATFORM_BEOS; - } - elseif (stripos($this->_agent, 'win') !== false) + } + elseif (stripos($this->_agent, 'win') !== false) { $this->_platform = self::PLATFORM_WINDOWS; } diff --git a/includes/options/redux-framework/inc/fields/editor/field_editor_c.php b/includes/options/redux-framework/inc/fields/editor/field_editor_c.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/includes/options/redux-framework/inc/validation/preg_replace/validation_preg_replace.php b/includes/options/redux-framework/inc/validation/preg_replace/validation_preg_replace.php index 3297b348c..7bdc145c3 100644 --- a/includes/options/redux-framework/inc/validation/preg_replace/validation_preg_replace.php +++ b/includes/options/redux-framework/inc/validation/preg_replace/validation_preg_replace.php @@ -26,8 +26,8 @@ function __construct( $parent, $field, $value, $current ) { * @since ReduxFramework 1.0.0 */ function validate() { - + $this->value = preg_replace( $this->field['preg']['pattern'], $this->field['preg']['replacement'], $this->value ); } //function } //class - } \ No newline at end of file + } From 6cf52d072890d8e3c3d140038ae70fc5af97cc0f Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Fri, 9 Dec 2016 16:48:11 +0530 Subject: [PATCH 10/37] issue fixed #245 #240 --- templates/features.php | 45 +++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/templates/features.php b/templates/features.php index 35e0b7e1d..f9d7e05b8 100644 --- a/templates/features.php +++ b/templates/features.php @@ -825,26 +825,35 @@ function remove_this(){ add_action('amp_post_template_head','ampforwp_custom_title_tag'); function ampforwp_custom_title_tag(){ - global $post; ?> - - <?php - global $redux_builder_amp; - if(is_single()){ - global $post; - $titl = $post->post_title; - echo $titl; - } elseif ($redux_builder_amp['amp-frontpage-select-option']==0 && (is_front_page() || is_archive())) { - echo bloginfo('name'); - }elseif($redux_builder_amp['amp-frontpage-select-option']){ - // global $post; - echo get_query_var('pagename'); - }elseif (is_home()) { - echo get_query_var('pagename'); - } - ?> + <title> + <?php + global $redux_builder_amp; - + // title for a single post and single page + if( is_single() || is_page() ){ + global $post; + $titl = $post->post_title; + echo $titl; + } + // title for archive pages + if ( is_archive() ) { + the_archive_title( '' ); + the_archive_description( '' ); + } + // title for Static front page + if ( $redux_builder_amp['amp-frontpage-select-option']== 1 && ( is_front_page() ) ) { + $ID = $redux_builder_amp['amp-frontpage-select-option-pages']; + echo get_the_title( $ID ); + + } + // title for index page + if ( is_front_page() && $redux_builder_amp['amp-frontpage-select-option']== 0 ) { + echo bloginfo('name') ; + } + ?> + Date: Fri, 9 Dec 2016 16:50:28 +0530 Subject: [PATCH 11/37] issue fixed #261 Additional : Fixed validation error from meta-info setion --- templates/design-manager/design-1/elements/meta-info.php | 2 +- templates/design-manager/design-1/style.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/design-manager/design-1/elements/meta-info.php b/templates/design-manager/design-1/elements/meta-info.php index dc1d566dc..726e38a16 100644 --- a/templates/design-manager/design-1/elements/meta-info.php +++ b/templates/design-manager/design-1/elements/meta-info.php @@ -11,7 +11,7 @@ ?>
- " width="24" height="24" layout="fixed"> + width="24" height="24" layout="fixed"> display_name ); ?>
diff --git a/templates/design-manager/design-1/style.php b/templates/design-manager/design-1/style.php index 613caa324..9b9dfc4ce 100644 --- a/templates/design-manager/design-1/style.php +++ b/templates/design-manager/design-1/style.php @@ -277,6 +277,7 @@ function ampforwp_additional_style_input( $amp_template ) { line-height: 1.5em; margin: 0; padding: .66em 10px .75em; + text-align: center; } /* AMP Media */ @@ -471,7 +472,6 @@ function ampforwp_additional_style_input( $amp_template ) { /* Social Icons */ .ampforwp-social-icons{ margin: 1.5em 16px 1.5em; - height: 30px; } .whatsapp-share-icon { width: 50px; From 5a3ce78f49ebf23246f0b2a908ed00f003585685 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Fri, 9 Dec 2016 20:03:18 +0530 Subject: [PATCH 12/37] After Fresh installation - a save is required Fixed After Fresh installation - a save is required for no errors --- templates/design-manager.php | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/templates/design-manager.php b/templates/design-manager.php index c52149435..37378d5f6 100644 --- a/templates/design-manager.php +++ b/templates/design-manager.php @@ -2,7 +2,7 @@ if ( is_customize_preview() ) { - + // Load all the elements in the customizer as we want all the elements in design-manager add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_the_title' ); add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_meta_info' ); @@ -12,15 +12,15 @@ add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_social_icons' ); add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_comments' ); add_filter( 'ampforwp_design_elements', 'ampforwp_add_element_related_posts' ); -} +} $data = get_option( 'ampforwp_design' ); - // Adding default Value + // Adding default Value if ($data['elements'] == '') { $data['elements'] = "meta_info:1,title:1,featured_image:1,content:1,meta_taxonomy:1,social_icons:1,comments:1,related_posts:1"; - } + } if( isset( $data['elements'] ) || ! empty( $data['elements'] ) ){ $options = explode( ',', $data['elements'] ); @@ -63,25 +63,31 @@ // Design Selector add_action('pre_amp_render_post','ampforwp_design_selector', 11 ); function ampforwp_design_selector() { - + global $redux_builder_amp; if ( $redux_builder_amp ) { - return $redux_builder_amp['amp-design-selector']; + return $redux_builder_amp['amp-design-selector']; } else { return 2; } - + } add_action('pre_amp_render_post','ampforwp_stylesheet_file_insertion', 12 ); function ampforwp_stylesheet_file_insertion() { + + if ( empty( ampforwp_design_selector() ) ) { + $ampforwp_design_selector = 2; + } else { + $ampforwp_design_selector = ampforwp_design_selector(); + } // Add StyleSheet - require AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. ampforwp_design_selector() . '/style.php'; -} + require AMPFORWP_PLUGIN_DIR . 'templates/design-manager/design-'. $ampforwp_design_selector . '/style.php'; +} -// Post Title +// Post Title function ampforwp_add_element_the_title( $meta_parts ) { $meta_parts[] = 'ampforwp-the-title'; return $meta_parts; @@ -144,7 +150,7 @@ function ampforwp_design_element_the_content( $file, $type, $post ) { return $file; } -// Meta Texonomy +// Meta Texonomy function ampforwp_add_element_meta_taxonomy( $meta_parts ) { $meta_parts[] = 'ampforwp-meta-taxonomy'; return $meta_parts; @@ -158,7 +164,7 @@ function ampforwp_design_element_meta_taxonomy( $file, $type, $post ) { return $file; } -// Social Icons +// Social Icons function ampforwp_add_element_social_icons( $meta_parts ) { $meta_parts[] = 'ampforwp-social-icons'; return $meta_parts; @@ -187,7 +193,7 @@ function ampforwp_design_element_comments( $file, $type, $post ) { return $file; } -// Related Posts +// Related Posts function ampforwp_add_element_related_posts( $meta_parts ) { $meta_parts[] = 'ampforwp-related-posts'; return $meta_parts; @@ -201,7 +207,7 @@ function ampforwp_design_element_related_posts( $file, $type, $post ) { return $file; } - + ?> From 30bfe0c604ce683f04330b475ba596420085d672 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Fri, 9 Dec 2016 20:38:35 +0530 Subject: [PATCH 13/37] Excerpt lenght controlled --- templates/design-manager/design-1/index.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/design-manager/design-1/index.php b/templates/design-manager/design-1/index.php index 71918d8ef..f07291195 100644 --- a/templates/design-manager/design-1/index.php +++ b/templates/design-manager/design-1/index.php @@ -35,12 +35,13 @@ -

+ ?> +

+ From 441cc56e7ce6eb1b04b2c20ac403490437191dda Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Fri, 9 Dec 2016 20:39:13 +0530 Subject: [PATCH 14/37] fixed issue #261 --- templates/design-manager/design-1/index.php | 38 ++++++++++++++++----- templates/design-manager/design-1/style.php | 9 +++++ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/templates/design-manager/design-1/index.php b/templates/design-manager/design-1/index.php index f07291195..6e6f043ca 100644 --- a/templates/design-manager/design-1/index.php +++ b/templates/design-manager/design-1/index.php @@ -22,18 +22,35 @@ -
+
-

- - -

+

+ + +

-
- load_parts( apply_filters( 'amp_post_template_meta_parts', array( 'meta-author', 'meta-time' ) ) ); ?> -
- +
+ load_parts( apply_filters( 'amp_post_template_meta_parts', array( 'meta-author', 'meta-time' ) ) ); ?> +
+ + + + +
+ + width=100 height=75> + +
+ +

+
+ +
diff --git a/templates/design-manager/design-1/style.php b/templates/design-manager/design-1/style.php index 9b9dfc4ce..93ea829e6 100644 --- a/templates/design-manager/design-1/style.php +++ b/templates/design-manager/design-1/style.php @@ -457,6 +457,15 @@ function ampforwp_additional_style_input( $amp_template ) { #pagination .prev { display: inline-block; } + .amp-wp-home .amp-wp-content p { + display: inline; + } + + .home-post-image { + float: right ; + margin: 0 0 10px 20px; + + } /* Single */ .amp-wp-article-content amp-img { From 67670bca5412e8185050f5a4db0d8c4e7d30a854 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Fri, 9 Dec 2016 20:55:42 +0530 Subject: [PATCH 15/37] fixed Non AMP Link It was broken everywhere and also added it to Design 1 --- templates/design-manager/design-1/footer.php | 32 +++++++++++- templates/design-manager/design-2/footer.php | 54 +++++++++++--------- templates/design-manager/design-2/index.php | 4 +- 3 files changed, 61 insertions(+), 29 deletions(-) diff --git a/templates/design-manager/design-1/footer.php b/templates/design-manager/design-1/footer.php index ccdf981f1..e122ee3d7 100644 --- a/templates/design-manager/design-1/footer.php +++ b/templates/design-manager/design-1/footer.php @@ -1,4 +1,19 @@ - +ID ); + } + if( is_archive() ) { + global $wp; + $ampforwp_backto_nonamp = esc_url( home_url( $wp->request ) ); + } + ?>

get( 'blog_name' ) ); ?>

@@ -8,7 +23,20 @@ echo wp_kses($redux_builder_amp['amp-translator-footer-text'],$allowed_html) ; ?>

- + +

+ + + + | + + +

diff --git a/templates/design-manager/design-2/footer.php b/templates/design-manager/design-2/footer.php index 95896fe43..5a75ce1fe 100644 --- a/templates/design-manager/design-2/footer.php +++ b/templates/design-manager/design-2/footer.php @@ -1,26 +1,32 @@ ID ); -} else { - $ampforwp_backto_nonamp = ''; -} -?> -
- -
+ wp_reset_postdata(); + + $ampforwp_backto_nonamp = " Kuch bhi nahi hai"; + if ( is_home() ) { + $ampforwp_backto_nonamp = home_url(); + } + if ( is_single() ){ + $ampforwp_backto_nonamp = get_permalink( $post->ID ); + } + if( is_archive() ) { + global $wp; + $ampforwp_backto_nonamp = esc_url( home_url( $wp->request ) ); + } + ?> +
+ +
diff --git a/templates/design-manager/design-2/index.php b/templates/design-manager/design-2/index.php index 6c7072753..ccf6a8698 100644 --- a/templates/design-manager/design-2/index.php +++ b/templates/design-manager/design-2/index.php @@ -50,9 +50,7 @@

-
- - + From d9cb2d8c477e3d23bb8bdd0eadb8ceab291ed926 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Fri, 9 Dec 2016 20:57:55 +0530 Subject: [PATCH 16/37] archive pages where broken When Static front page is set , Archive pages were broken --- templates/features.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/features.php b/templates/features.php index f9d7e05b8..13f3bb831 100644 --- a/templates/features.php +++ b/templates/features.php @@ -106,11 +106,17 @@ function ampforwp_custom_template( $file, $type, $post ) { } } } elseif ($redux_builder_amp['amp-frontpage-select-option'] == 1) { - if ( is_home() || is_archive() ) { + if ( is_home() ) { if ( 'single' === $type ) { $file = AMPFORWP_PLUGIN_DIR . '/templates/design-manager/design-'. ampforwp_design_selector() .'/frontpage.php'; } } + if ( is_archive() ) { + if ( 'single' === $type ) { + $file = AMPFORWP_PLUGIN_DIR . '/templates/design-manager/design-'. ampforwp_design_selector() .'/index.php'; + } + } + } // Custom Single file if ( is_single() || is_page() ) { From f75ab5bedaa660f8d85add5a25716fd2f86f6df6 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Sat, 10 Dec 2016 13:31:23 +0530 Subject: [PATCH 17/37] Deselctable next previous links in Single --- includes/options/options-init.php | 8 ++ templates/design-manager/design-1/footer.php | 2 +- .../design-2/elements/content.php | 75 +++++++++++++------ 3 files changed, 61 insertions(+), 24 deletions(-) diff --git a/includes/options/options-init.php b/includes/options/options-init.php index d2aee6532..65bb5315b 100644 --- a/includes/options/options-init.php +++ b/includes/options/options-init.php @@ -629,6 +629,14 @@ 'default' => 1, 'subtitle' => __('Enable Social Icons in single', 'redux-framework-demo'), ), + //deselectable next previous links + array( + 'id' => 'enable-single-next-prev', + 'type' => 'switch', + 'title' => __('Next-Previous Links', 'redux-framework-demo'), + 'default' => 1, + 'subtitle' => __('Enable Next-Previous links in single', 'redux-framework-demo'), + ), // Width and Height of Image array( 'id' => 'enable-single-featured-img-width', diff --git a/templates/design-manager/design-1/footer.php b/templates/design-manager/design-1/footer.php index e122ee3d7..038524d1c 100644 --- a/templates/design-manager/design-1/footer.php +++ b/templates/design-manager/design-1/footer.php @@ -2,7 +2,7 @@ global $redux_builder_amp; wp_reset_postdata(); - $ampforwp_backto_nonamp = " Kuch bhi nahi hai"; + $ampforwp_backto_nonamp = ''; if ( is_home() ) { $ampforwp_backto_nonamp = home_url(); } diff --git a/templates/design-manager/design-2/elements/content.php b/templates/design-manager/design-2/elements/content.php index dff85dabb..f1435a451 100644 --- a/templates/design-manager/design-2/elements/content.php +++ b/templates/design-manager/design-2/elements/content.php @@ -1,26 +1,55 @@
-
- - - get( 'post_amp_content' ); // amphtml content; no kses ?> - - -
-
- + + +
From fe96fe92b3fc9388ae90c5013e428a58a9014b03 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Sat, 10 Dec 2016 13:35:33 +0530 Subject: [PATCH 18/37] beautified content.php --- templates/design-manager/design-2/elements/content.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/templates/design-manager/design-2/elements/content.php b/templates/design-manager/design-2/elements/content.php index f1435a451..b7c6b985a 100644 --- a/templates/design-manager/design-2/elements/content.php +++ b/templates/design-manager/design-2/elements/content.php @@ -3,17 +3,11 @@
- - - + - get( 'post_amp_content' ); // amphtml content; no kses ?> - - - - +
From bbbe1392ff19d609e3c5ef63a3a9d0bf51cfe239 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Sat, 10 Dec 2016 14:43:01 +0530 Subject: [PATCH 19/37] issue fixed #272 --- templates/design-manager/design-1/elements/social-icons.php | 6 +++--- templates/design-manager/design-2/elements/social-icons.php | 4 ++-- templates/features.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/design-manager/design-1/elements/social-icons.php b/templates/design-manager/design-1/elements/social-icons.php index 0259e901f..a604390d7 100644 --- a/templates/design-manager/design-1/elements/social-icons.php +++ b/templates/design-manager/design-1/elements/social-icons.php @@ -1,4 +1,4 @@ - +
@@ -19,10 +19,10 @@ - +
-
\ No newline at end of file +
diff --git a/templates/design-manager/design-2/elements/social-icons.php b/templates/design-manager/design-2/elements/social-icons.php index 109ef221b..7e66ddb22 100644 --- a/templates/design-manager/design-2/elements/social-icons.php +++ b/templates/design-manager/design-2/elements/social-icons.php @@ -1,4 +1,4 @@ - +
@@ -19,7 +19,7 @@ - +
diff --git a/templates/features.php b/templates/features.php index 13f3bb831..e8c3e2529 100644 --- a/templates/features.php +++ b/templates/features.php @@ -780,7 +780,7 @@ function ampforwp_sticky_social_icons(){ - +
From 2397383df582c39915148de5324504776af82cbe Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Sat, 10 Dec 2016 14:58:02 +0530 Subject: [PATCH 20/37] issue fixed #269 all Meta issues in both Design 1 and Design 2 --- .../design-1/elements/meta-info.php | 1 + .../design-1/elements/meta-taxonomy.php | 29 ++++++++++++-- .../design-2/elements/meta-info.php | 23 +++++++++-- .../design-2/elements/meta-taxonomy.php | 38 ++++++++++++------- 4 files changed, 72 insertions(+), 19 deletions(-) diff --git a/templates/design-manager/design-1/elements/meta-info.php b/templates/design-manager/design-1/elements/meta-info.php index 726e38a16..6e646562f 100644 --- a/templates/design-manager/design-1/elements/meta-info.php +++ b/templates/design-manager/design-1/elements/meta-info.php @@ -29,4 +29,5 @@ ?>
+ diff --git a/templates/design-manager/design-1/elements/meta-taxonomy.php b/templates/design-manager/design-1/elements/meta-taxonomy.php index c4b92a395..487dc2a52 100644 --- a/templates/design-manager/design-1/elements/meta-taxonomy.php +++ b/templates/design-manager/design-1/elements/meta-taxonomy.php @@ -1,16 +1,39 @@
- + ID, 'category' ); if ( $ampforwp_categories ) : ?>
- + term_taxonomy_id).'?'. AMP_QUERY_VAR .'" > '. $cat->name .''); + if($redux_builder_amp['ampforwp-amp-on-off-catgs-tags']){ + echo (' '. $cat->name .''); + } else { + echo (' '. $cat->name .''); + } } ?>
+ ID, 'post_tag' ); + if ( $ampforwp_tags && ! is_wp_error( $ampforwp_tags ) ) :?> +
+ term_taxonomy_id)).'">'.$tag->name .''); + } else { + echo (''.$tag->name .''); + } + } + if($redux_builder_amp['amp-rtl-select-option']) { + global $redux_builder_amp; printf( __($redux_builder_amp['amp-translator-tags-text'] .' ', 'amp' )); + }?> +
+ +
diff --git a/templates/design-manager/design-2/elements/meta-info.php b/templates/design-manager/design-2/elements/meta-info.php index 956f7562a..fc084ce0c 100644 --- a/templates/design-manager/design-2/elements/meta-info.php +++ b/templates/design-manager/design-2/elements/meta-info.php @@ -20,10 +20,27 @@ $ampforwp_categories = get_the_terms( $this->ID, 'category' ); if ( $ampforwp_categories ) : ?>
- + + + term_taxonomy_id).'?amp" >'.$cat->name .''); - } ?> + if($redux_builder_amp['ampforwp-amp-on-off-catgs-tags']){ + echo (''.$cat->name .''); + } else { + echo (''.$cat->name .''); + } + } + + //if RTL is ON + if($redux_builder_amp['amp-rtl-select-option']) { + global $redux_builder_amp; printf( __($redux_builder_amp['amp-translator-categories-text'] .' ', 'amp' )); + } + ?>
diff --git a/templates/design-manager/design-2/elements/meta-taxonomy.php b/templates/design-manager/design-2/elements/meta-taxonomy.php index c53816b7f..77ac6c6c6 100644 --- a/templates/design-manager/design-2/elements/meta-taxonomy.php +++ b/templates/design-manager/design-2/elements/meta-taxonomy.php @@ -1,16 +1,28 @@
+ID, 'post_tag' ); + if ( $ampforwp_tags && ! is_wp_error( $ampforwp_tags ) ) :?> +
+ term_taxonomy_id)).'">'.$tag->name .''); + } else { + echo (''.$tag->name .''); + } + } -ID, 'post_tag' ); - if ( $ampforwp_tags && ! is_wp_error( $ampforwp_tags ) ) : ?> -
- term_taxonomy_id).'?amp" >'.$tag->name .''); - } ?> -
- - -
\ No newline at end of file + //if RTL is ON + if($redux_builder_amp['amp-rtl-select-option']) { + global $redux_builder_amp; printf( __($redux_builder_amp['amp-translator-tags-text'] .' ', 'amp' )); + } + ?> + +
+ + From 009cacc843ee3724621b34ca09c7abbb61b6c9a6 Mon Sep 17 00:00:00 2001 From: Khaled Mohammed Date: Sat, 10 Dec 2016 16:23:34 +0530 Subject: [PATCH 21/37] issue #269 --- .../design-manager/design-1/elements/related-posts.php | 4 ++-- templates/design-manager/design-1/style.php | 6 ++++++ .../design-manager/design-2/elements/related-posts.php | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/templates/design-manager/design-1/elements/related-posts.php b/templates/design-manager/design-1/elements/related-posts.php index e1d31dd72..56a92fc3c 100644 --- a/templates/design-manager/design-1/elements/related-posts.php +++ b/templates/design-manager/design-1/elements/related-posts.php @@ -39,7 +39,7 @@ have_posts() ) { $my_query->the_post();?> -
  • +
  • " width="150" height="150" layout="responsive">
    - + + footer { + padding-bottom: 50px; + } + /* Custom Style Code */ Date: Sat, 10 Dec 2016 18:52:25 +0530 Subject: [PATCH 22/37] issue fixed #269 translation --- templates/design-manager/design-1/elements/meta-info.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/design-manager/design-1/elements/meta-info.php b/templates/design-manager/design-1/elements/meta-info.php index 6e646562f..f63ff84c3 100644 --- a/templates/design-manager/design-1/elements/meta-info.php +++ b/templates/design-manager/design-1/elements/meta-info.php @@ -20,9 +20,10 @@