Update mantra 3.0.4

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

1 files changed, 85 insertions, 91 deletions

diff --git a/themes/mantra/includes/theme-styles.php b/themes/mantra/includes/theme-styles.php
index 0576d6fc..43f4c5c3 100644
--- a/themes/mantra/includes/theme-styles.php
+++ b/themes/mantra/includes/theme-styles.php
@@ -1,95 +1,90 @@
-<?php 
+<?php
 /*
- * Styles and scripts registration and enqueuing 
+ * Styles and scripts registration and enqueuing
  *
  * @package mantra
  * @subpackage Functions
  */
- 
-// Adding the viewport meta if the mobile view has been enabled
 
+// Adding the viewport meta if the mobile view has been enabled
 function mantra_mobile_meta() {
-global $mantra_options;
-if ($mantra_options['mantra_zoom'] == 1) 
-	return '<meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0, minimum-scale=1.0, maximum-scale=3.0">';
-else return '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">';
+    global $mantra_options;
+	if ($mantra_options['mantra_zoom'] == 1) {
+    	echo '<meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0, minimum-scale=1.0, maximum-scale=3.0">' . PHP_EOL;
+	} else {
+		echo '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">' . PHP_EOL;
+	}
 }
+if ($mantra_options['mantra_mobile']) add_action( 'cryout_seo_hook', 'mantra_mobile_meta' );
 
 
-function mantra_register_styles() {
+function mantra_enqueue_styles() {
 	global $mantra_options;
-	foreach ($mantra_options as $key => $value) { ${"$key"} = $value ;}
-
-	wp_register_style( 'mantras', get_stylesheet_uri(), NULL, _CRYOUT_THEME_VERSION  );
-	
-	if($mantra_mobile=="Enable") {	wp_register_style( 'mantra-mobile', get_template_directory_uri() . '/style-mobile.css', NULL, _CRYOUT_THEME_VERSION  );}
-	
-	wp_register_style( 'mantra_googlefont', esc_attr($mantra_googlefont2 ));
-	wp_register_style( 'mantra_googlefonttitle', esc_attr($mantra_googlefonttitle2 ));
-	wp_register_style( 'mantra_googlefontside',esc_attr($mantra_googlefontside2) );
-	wp_register_style( 'mantra_googlefontsubheader', esc_attr($mantra_googlefontsubheader2) );
-	
-}
 
-add_action('init', 'mantra_register_styles' );
+	// Main theme style
+	wp_enqueue_style( 'mantra-style', get_stylesheet_uri(), NULL, _CRYOUT_THEME_VERSION  );
 
+	// Google Fonts
+	if (!empty($mantra_options['mantra_googlefont']))
+		wp_enqueue_style( 'mantra-googlefont', "//fonts.googleapis.com/css?family=" . preg_replace( '/\s+/', '+', esc_attr($mantra_options['mantra_googlefont']) ) );
+	if (!empty($mantra_options['mantra_googlefonttitle']))
+		wp_enqueue_style( 'mantra-googlefont-title', "//fonts.googleapis.com/css?family=" . preg_replace( '/\s+/', '+', esc_attr($mantra_options['mantra_googlefonttitle']) ) );
+	if (!empty($mantra_options['mantra_googlefontside']))
+		wp_enqueue_style( 'mantra-googlefont-side', "//fonts.googleapis.com/css?family=" . preg_replace( '/\s+/', '+', esc_attr($mantra_options['mantra_googlefontside']) ) );
+	if (!empty($mantra_options['mantra_googlefontsubheader']))
+		wp_enqueue_style( 'mantra-googlefont-headings', "//fonts.googleapis.com/css?family=" . preg_replace( '/\s+/', '+', esc_attr($mantra_options['mantra_googlefontsubheader']) ) );
 
-function mantra_enqueue_styles() {
-	global $mantra_options;
-	foreach ($mantra_options as $key => $value) { ${"$key"} = $value ;}
-	
-	wp_enqueue_style( 'mantras');
-	
-	wp_enqueue_style( 'mantra_googlefont');
-	wp_enqueue_style( 'mantra_googlefonttitle');
-	wp_enqueue_style( 'mantra_googlefontside');
-	wp_enqueue_style( 'mantra_googlefontsubheader');
+	// Options-based generated styling
+	wp_add_inline_style( 'mantra-style', preg_replace( "/[\n\r\t\s]+/", " ", mantra_custom_styles() ) ); // includes/custom-styles.php
 
+	// Presentation Page options-based styling (only used when needed)
+	if ( ($mantra_options['mantra_frontpage']=="Enable") && is_front_page() ) {
+		wp_add_inline_style( 'mantra-style', preg_replace( "/[\n\r\t\s]+/", " ", mantra_frontpage_css() ) ); // also in includes/custom-styles.php
+	}
+
+	// RTL support
+	if ( is_rtl() ) wp_enqueue_style( 'mantra-rtl', get_template_directory_uri() . '/resources/css/rtl.css', NULL, _CRYOUT_THEME_VERSION );
+
+	// User supplied custom styling
+	wp_add_inline_style( 'mantra-style', preg_replace( "/[\n\r\t\s]+/", " ", mantra_customcss() ) ); // also in includes/custom-styles.php
+
+	/// Responsive styling (loaded last)
+	if ( $mantra_options['mantra_mobile']=="Enable" ) {
+		wp_enqueue_style( 'mantra-mobile', get_template_directory_uri() . '/resources/css/style-mobile.css', NULL, _CRYOUT_THEME_VERSION  );
+	}
 
 }
-		
 add_action('wp_enqueue_scripts', 'mantra_enqueue_styles' );
-		
-function mantra_styles_echo() {
-	global $mantra_options;
-	
-	foreach ($mantra_options as $key => $value) { ${"$key"} = $value ;}
-	
-	echo preg_replace("/[\n\r\t\s]+/"," " ,mantra_custom_styles())."\n";
-	if(($mantra_frontpage=="Enable")&&is_front_page()) { echo preg_replace("/[\n\r\t\s]+/"," " ,mantra_frontpage_css())."\n";}
-	if($mantra_mobile=="Enable") {wp_enqueue_style( 'mantra-mobile'); echo mantra_mobile_meta();}
-	echo preg_replace("/[\n\r\t\s]+/"," " ,mantra_customcss())."\n";
-} 
-
-add_action('wp_head', 'mantra_styles_echo');
-
-		
-// JS loading and hook into wp_enque_scripts
-
-add_action('wp_head', 'mantra_customjs' );
-		
 
 
+// JS loading and hook into wp_enque_scripts
+add_action('wp_head', 'mantra_customjs' );
 
 // Scripts loading and hook into wp_enque_scripts
-
 function mantra_scripts_method() {
-global $mantra_options;
-foreach ($mantra_options as $key => $value) {
-    							 ${"$key"} = $value ;
-									}
+    global $mantra_options;
 
-// If frontend - load the js for the menu and the social icons animations
+    // If frontend - load the js for the menu and the social icons animations
 	if ( !is_admin() ) {
-		wp_register_script('cryout-frontend',get_template_directory_uri() . '/js/frontend.js', array('jquery'), _CRYOUT_THEME_VERSION  );
-		wp_enqueue_script('cryout-frontend');
-  		// If mantra from page is enabled and the current page is home page - load the nivo slider js							
-		if($mantra_frontpage == "Enable" && is_front_page()) {
-							wp_register_script('cryout-nivoSlider',get_template_directory_uri() . '/js/nivo-slider.js', array('jquery'), _CRYOUT_THEME_VERSION );
-							wp_enqueue_script('cryout-nivoSlider');
-							}
+		wp_enqueue_script( 'mantra-frontend', get_template_directory_uri() . '/resources/js/frontend.js', array('jquery'), _CRYOUT_THEME_VERSION );
+
+		$js_options = array(
+			'responsive' => 0,
+			'image_class' => '',
+			'equalize_sidebars' => 0,
+		);
+		$js_options['image_class'] = 'image' . $mantra_options['mantra_image'];
+		if ( $mantra_options['mantra_mobile'] == "Enable" ) { $js_options['responsive'] = 1; }
+		if ( !empty($mantra_options['mantra_s1bg']) || !empty($mantra_options['mantra_s2bg']) ) { $js_options['equalize_sidebars'] = 1; }
+
+		wp_localize_script( 'mantra-frontend', 'mantra_options',  $js_options );
+
+  		// If mantra presentation page is enabled and the current page is home page - load the nivo slider js
+		if ( $mantra_options['mantra_frontpage'] == "Enable" && is_front_page() ) {
+			wp_enqueue_script( 'mantra-nivoslider', get_template_directory_uri() . '/resources/js/nivo-slider.js', array('jquery'), _CRYOUT_THEME_VERSION );
+		}
+
   	}
-	
 
 	/* We add some JavaScript to pages with the comment form
 	 * to support sites with threaded comments (when in use).
@@ -97,37 +92,36 @@ foreach ($mantra_options as $key => $value) {
 	if ( is_singular() && get_option( 'thread_comments' ) )
 		wp_enqueue_script( 'comment-reply' );
 }
-
 add_action('wp_enqueue_scripts', 'mantra_scripts_method');
 
 /**
  *  Adding CSS3 PIE behavior to elements that need it
  */
 function mantra_ie_pie() {
-   echo '
-<!--[if lte IE 8]>
-<style type="text/css" media="screen">
- #access ul  li,
-.edit-link a ,
- #footer-widget-area .widget-title, .entry-meta,.entry-meta .comments-link,
-.short-button-light, .short-button-dark ,.short-button-color ,blockquote  {
-     position:relative;
-     behavior: url('.get_template_directory_uri().'/js/PIE/PIE.php);
-   }
-
-#access ul ul {
--pie-box-shadow:0px 5px 5px #999;
-}
-   
-#access  ul  li.current_page_item,  #access ul li.current-menu-item ,
-#access ul  li ,#access ul ul ,#access ul ul li, .commentlist li.comment	,.commentlist .avatar,
- .nivo-caption, .theme-default .nivoSlider {
-     behavior: url('.get_template_directory_uri().'/js/PIE/PIE.php);
-   }
-</style>
-<![endif]-->
-';
+	ob_start();
+	echo '<!--[if lte IE 8]>
+		<style type="text/css" media="screen">
+		 #access ul  li,
+		.edit-link a ,
+		 #footer-widget-area .widget-title, .entry-meta,.entry-meta .comments-link,
+		.short-button-light, .short-button-dark ,.short-button-color ,blockquote  {
+			 position:relative;
+			 behavior: url('.get_template_directory_uri().'/resources/js/PIE/PIE.php);
+		   }
+
+		#access ul ul {
+		-pie-box-shadow:0px 5px 5px #999;
+		}
+
+		#access  ul  li.current_page_item,  #access ul li.current-menu-item ,
+		#access ul  li ,#access ul ul ,#access ul ul li, .commentlist li.comment	,.commentlist .avatar,
+		 .nivo-caption, .theme-default .nivoSlider {
+			 behavior: url('.get_template_directory_uri().'/resources/js/PIE/PIE.php);
+		   }
+		</style>
+		<![endif]-->';
+	echo preg_replace( "/[\n\r\t\s]+/", " ", ob_get_clean() );
 }
 add_action('wp_head', 'mantra_ie_pie', 10);
 
-?>
\ No newline at end of file
+// FIN