2.0.3

webmandesign · Nov 14, 2019 · 92a3078 · 92a3078
1 parent ab2ef1a
commit 92a3078
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 12,583 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,22 @@
 # Reykjavik Changelog
 
+## 2.0.3
+
+* **Update**: WordPress 5.3 compatibility
+* **Update**: Removing demo content XML and setting manual import for One Click Demo Import plugin to comply with WordPress.org theme requirements
+* **Update**: Localization
+
+### Files changed:
+
+	changelog.md
+	readme.txt
+	style.css
+	assets/scss/main.scss
+	includes/plugins/one-click-demo-import/class-one-click-demo-import.php
+	includes/welcome/class-welcome.php
+	library/changelog.md
+
+
 ## 2.0.2
 
 * **Update**: Demo content

diff --git a/includes/plugins/one-click-demo-import/class-one-click-demo-import.php b/includes/plugins/one-click-demo-import/class-one-click-demo-import.php
@@ -6,7 +6,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    1.0.0
- * @version  1.5.2
+ * @version  2.0.3
  *
  * Contents:
  *
@@ -34,7 +34,7 @@ class Reykjavik_One_Click_Demo_Import {
 		 * Constructor
 		 *
 		 * @since    1.0.0
-		 * @version  1.0.1
+		 * @version  2.0.3
 		 */
 		private function __construct() {
 
@@ -54,8 +54,6 @@ private function __construct() {
 
 					// Filters
 
-						add_filter( 'pt-ocdi/import_files', __CLASS__ . '::files' );
-
 						add_filter( 'pt-ocdi/plugin_intro_text', __CLASS__ . '::info' );
 						add_action( 'pt-ocdi/plugin_intro_text', __CLASS__ . '::jetpack_custom_posts' );
 
@@ -98,7 +96,7 @@ public static function init() {
 		 * Import files setup
 		 *
 		 * @since    1.0.0
-		 * @version  1.0.1
+		 * @version  2.0.3
 		 */
 		public static function files() {
 
@@ -107,10 +105,8 @@ public static function files() {
 				return array(
 
 						array(
-							'import_file_name'       => esc_html__( 'Theme demo content', 'reykjavik' ),
-							'import_file_url'        => esc_url( get_theme_file_uri( 'includes/plugins/one-click-demo-import/demo-content-reykjavik.xml' ) ),
-							'import_widget_file_url' => esc_url( get_theme_file_uri( 'includes/plugins/one-click-demo-import/demo-widgets-reykjavik.wie' ) ),
-							'preview_url'            => 'https://themedemos.webmandesign.eu/reykjavik/',
+							'import_file_name' => esc_html__( 'Theme demo content', 'reykjavik' ),
+							'preview_url'      => 'https://themedemos.webmandesign.eu/reykjavik/',
 						),
 
 					);
@@ -129,14 +125,32 @@ public static function files() {
 		 * Info texts
 		 *
 		 * @since    1.0.0
-		 * @version  1.5.2
+		 * @version  2.0.3
 		 *
 		 * @param  string $text  Default intro text.
 		 */
 		public static function info( $text = '' ) {
 
 			// Processing
 
+				$text .= '<div class="manual-import-info">';
+
+					$text .= '<h2>';
+					$text .= esc_html__( 'Manual import procedure', 'reykjavik' );
+					$text .= '</h2>';
+
+					$text .= '<p>';
+					$text .= esc_html__( 'By importing this demo content you get the exact copy of the theme demo website.', 'reykjavik' );
+					$text .= ' (<a href="https://themedemos.webmandesign.eu/reykjavik/">' . esc_html__( 'Preview the theme demo website &raquo;', 'reykjavik' ) . '</a>)';
+
+					$text .= '<br>';
+
+					$text .= esc_html__( 'For instructions on importing theme demo content please visit GitHub repository.', 'reykjavik' );
+					$text .= ' (<a href="https://github.com/webmandesign/demo-content/blob/master/reykjavik/readme.md#what-is-this">' . esc_html__( 'GitHub repository instructions &raquo;', 'reykjavik' ) . '</a>)';
+					$text .= '</p>';
+
+				$text .= '</div>';
+
 				$text .= '<div class="media-files-quality-info">';
 
 					$text .= '<h3>';
@@ -154,7 +168,7 @@ public static function info( $text = '' ) {
 				$text .= '<div class="ocdi__demo-import-notice">';
 
 					$text .= '<h3>';
-					$text .= esc_html__( 'Install demo required plugins!', 'reykjavik' );
+					$text .= esc_html__( 'Install demo required plugins first!', 'reykjavik' );
 					$text .= '</h3>';
 
 					$text .= '<p>';