Merge branch 'release/1.7.2'

siteorigin · Aug 1, 2016 · 3a6fc33 · 3a6fc33
2 parents 875b556 + f531a5b
commit 3a6fc33
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 dist
+.DS_Store
diff --git a/README.md b/README.md
@@ -33,7 +33,11 @@ Screenshot includes an image by Kathy Priday. Released under GPL.
 Change Log
 -----------------------------------------------
 
-#### 1.7 - 2 June 2016
+#### 1.7.2 - 1 August 2016
+* Updated settings framework.
+* Integrated with SiteOrigin Premium.
+
+#### 1.7.1 - 2 June 2016
 * Properly include all minified JS versions.
 
 #### 1.7 - 30 May 2016

diff --git a/admin/about/screenshot-1.jpg b/admin/about/screenshot-1.jpg
diff --git a/admin/about/screenshot-2.jpg b/admin/about/screenshot-2.jpg
diff --git a/inc/customizer/customizer.php b/inc/customizer/customizer.php
@@ -577,17 +577,15 @@ function create_css_builder(){
 	 * Enqueue the customizer scripts
 	 */
 	function enqueue(){
-		$js_suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		wp_enqueue_script('siteorigin-customizer-preview', get_template_directory_uri() . '/inc/customizer/js/live-customizer' . $js_suffix . '.js', array( 'jquery','customize-preview' ), SITEORIGIN_THEME_VERSION);
+		wp_enqueue_script('siteorigin-customizer-preview', get_template_directory_uri() . '/inc/customizer/js/live-customizer' . SITEORIGIN_THEME_JS_PREFIX . '.js', array( 'jquery','customize-preview' ), SITEORIGIN_THEME_VERSION);
 		wp_localize_script('siteorigin-customizer-preview', 'customizeSettings', $this->settings);
 	}
 
 	/**
 	 * Enqueue scripts for the actual customizer admin
 	 */
 	function admin_enqueue( ){
-		$js_suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-		wp_enqueue_script('siteorigin-customizer-admin', get_template_directory_uri() . '/inc/customizer/js/admin' . $js_suffix . '.js', array( 'jquery', 'customize-controls' ), SITEORIGIN_THEME_VERSION);
+		wp_enqueue_script('siteorigin-customizer-admin', get_template_directory_uri() . '/inc/customizer/js/admin' . SITEORIGIN_THEME_JS_PREFIX . '.js', array( 'jquery', 'customize-controls' ), SITEORIGIN_THEME_VERSION);
 		wp_localize_script('siteorigin-customizer-admin', 'soCustomizeAdmin', array(
 			'confirm' => __('Are you sure you want to reset your theme customizations?', 'origami'),
 			'button' => __('Reset Customizations', 'origami'),

diff --git a/inc/mobilenav/mobilenav.php b/inc/mobilenav/mobilenav.php
@@ -9,8 +9,7 @@
 function siteorigin_mobilenav_enqueue_scripts() {
 	$root_uri = get_template_directory_uri() . '/inc/mobilenav/';
 
-	$js_suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-	wp_enqueue_script( 'siteorigin-mobilenav', $root_uri . 'js/mobilenav' . $js_suffix . '.js', array( 'jquery' ), SITEORIGIN_THEME_VERSION );
+	wp_enqueue_script( 'siteorigin-mobilenav', $root_uri . 'js/mobilenav' . SITEORIGIN_THEME_JS_PREFIX . '.js', array( 'jquery' ), SITEORIGIN_THEME_VERSION );
 
 	$text = array(
 		'navigate' => __( 'Menu', 'origami' ),

diff --git a/inc/settings b/inc/settings
diff --git a/inc/settings.php b/inc/settings.php
@@ -36,6 +36,10 @@ function origami_settings_init(){
 		'description' => __("Changes [gallery] shortcode galleries into a fancy slider.", 'origami')
 	));
 
+	$settings->add_teaser( 'display', 'attribution', 'checkbox', __( 'Footer Attribution', 'origami' ), array(
+		'description' => __("Hide/show the link to SiteOrigin in your footer.", 'origami')
+	) );
+
 	$settings->add_field('display', 'featured_image', 'checkbox', __('Display featured Image', 'origami'), array(
 		'description' => __('Featured image above posts', 'origami')
 	));
@@ -68,6 +72,10 @@ function origami_settings_init(){
 
 	$settings->add_section( 'comments', __('Comments', 'origami') );
 
+	$settings->add_teaser( 'comments', 'ajax', 'checkbox', __( 'Ajax Comments', 'origami' ), array(
+		'description' => __("Use ajax comments system.", 'origami')
+	) );
+
 }
 add_action('siteorigin_settings_init', 'origami_settings_init');
 
@@ -109,6 +117,14 @@ function origami_about_page_setup( $about ){
 
 	$about['description'] = __( 'Origami is one of our most elegant, mature WordPress themes. Find out more about what it has to offer by watching this short video.', 'origami' );
 
+	$about[ 'video_thumbnail' ] = array(
+		get_template_directory_uri() . '/admin/about/screenshot-1.jpg',
+		get_template_directory_uri() . '/admin/about/screenshot-2.jpg',
+	);
+
+	$about['documentation_url'] = 'https://siteorigin.com/origami-documentation/';
+	$about['review'] = true;
+
 	$about[ 'sections' ] = array(
 		'free',
 		'support',
@@ -117,8 +133,6 @@ function origami_about_page_setup( $about ){
 		'github',
 	);
 
-	$about[ 'premium_url' ] = false;
-
 	return $about;
 }
 add_filter( 'siteorigin_about_page', 'origami_about_page_setup' );