modified: 404.php

modified: admin-options.css modified: author.php modified: blank_front.php modified: changelog.txt modified: comments.php modified: date.php modified: editor-style.css modified: fonts.css modified: footer.php modified: functions.php modified: grids.css modified: header-front.php modified: header-xhtml.php modified: header.php modified: image.php modified: index.php modified: languages/css/en_US.css modified: languages/css/ja.css modified: lib/alias_functions.php modified: lib/csscolor.css.php modified: lib/csscolor/PEAR.php modified: lib/csscolor/csscolor.php modified: lib/hooks.php modified: lib/option-panel.php modified: loop.php modified: page-templates/front-page.php modified: page-templates/front-portfolio.php modified: page-templates/full-width.php modified: page-templates/page-featured.php modified: page.php modified: part-blog.php modified: part-gallery.php modified: part.php modified: raindrops.js modified: reset-fonts-grids.css modified: search.php modified: searchform.php modified: sidebar-default.php modified: sidebar-extra.php modified: sidebar.php modified: single.php modified: style.css
tenman · Oct 29, 2013 · 52ddfad · 52ddfad
1 parent e99f5f2
commit 52ddfad
Show file tree

Hide file tree

Showing 43 changed files with 1,528 additions and 1,259 deletions.
diff --git a/404.php b/404.php
@@ -11,9 +11,7 @@
  */
 		get_header( $raindrops_document_type ); 
 		do_action( 'raindrops_pre_'.basename( __FILE__) );
-
 		raindrops_debug_navitation( __FILE__ );
-
 ?>
 	<div id="yui-main">
 		<div class="yui-b">
@@ -66,4 +64,4 @@
 		do_action( 'raindrops_after_'.basename( __FILE__) );
 
 		get_footer( $raindrops_document_type );
-?>
+?>
diff --git a/admin-options.css b/admin-options.css
@@ -156,4 +156,4 @@ left:5px;
 width:48px;
 height:40px;
 background: url(images/options/icons32-vs.png) no-repeat 0 0;
-}
+}
diff --git a/author.php b/author.php
@@ -31,10 +31,8 @@
  * @uses raindrops_append_default_sidebar( )
  */
 		$curauth = get_userdata( intval( $author ) );
-
 		get_header( $raindrops_document_type );
 		do_action( 'raindrops_pre_'.basename( __FILE__) );
-
 		raindrops_debug_navitation( __FILE__ ); 
 ?>
 	<div id="yui-main">
@@ -120,9 +118,9 @@
 					<dl class="author">
 		  <!-- The Loop -->
 <?php
-		if ( have_posts( ) ){
+		if ( have_posts( ) ) {
 
-			while ( have_posts( ) ){
+			while ( have_posts( ) ) {
 
 			 the_post( );
 ?>
@@ -162,7 +160,7 @@
 <?php
 				$format = get_post_format( );
 
-				if( $format !== false ){
+				if ( $format !== false ) {
 ?>
 							<dd>
 <?php

diff --git a/blank_front.php b/blank_front.php
@@ -184,31 +184,30 @@
 
 ////////////////////////////////Functions and filters//////////////////////////////////////////////
 
-		if ( $raindrops_display_title !== 'y' ) {
+		if ( 'y' !== $raindrops_display_title ) {
 
 			add_filter( 'raindrops_site_title', '__return_null' );
 		}
 
-		if ( $raindrops_display_description !== 'y' ) {
+		if ( 'y' !== $raindrops_display_description ) {
 
 			add_filter( 'raindrops_site_description', '__return_null' );
 
 			add_filter( 'raindrops_header_image_elements' , 'raindrops_remove_header_text' );
 		}
 
-		function raindrops_remove_header_text( $content ){
+		function raindrops_remove_header_text( $content ) {
 
 			return preg_replace( '!<p[^>]*>(.*)</p>!siu', '', $content );
 		}
 
-		if ( $raindrops_display_header_image !== 'y' ) {
+		if ( 'y' !== $raindrops_display_header_image ) {
 
 			add_filter( 'raindrops_header_image_elements', '__return_null' );
 			add_filter( 'raindrops_header_image_home_url', '__return_null' );
-
 		}
 
-		if ( $raindrops_display_nav_menus !== 'y' ) {
+		if ( 'y' !== $raindrops_display_nav_menus ) {
 
 			if ( has_nav_menu( 'primary' ) ) {
 
@@ -219,7 +218,7 @@ function raindrops_remove_header_text( $content ){
 			}
 		}
 
-		if( $raindrops_display_page_content !== 'y' ){
+		if ( 'y' !== $raindrops_display_page_content ) {
 
 				add_filter( 'raindrops_entry_content', '__return_null' );
 		}
@@ -241,55 +240,55 @@ function raindrops_wp_link_pages_filter( $args ) {
 			return $args;
 		}
 
-		if( $raindrops_display_widget          !== 'y' ){
+		if ( 'y' !== $raindrops_display_widget ) {
 
 			add_filter( 'dynamic_sidebar', '__return_empty_array' );
 
 			add_filter( 'raindrops_sidebar_menus', '__return_null' );
 		}
 
-		if( $raindrops_add_custom_text_default_sidebar   == 'y' ){
+		if ( 'y' == $raindrops_add_custom_text_default_sidebar ) {
 
 			add_action( 'raindrops_prepend_default_sidebar', 'raindrops_prepend_default_sidebar_filter' );
 		}
 
-		if( $raindrops_add_custom_text_extra_sidebar   == 'y' ){
+		if ( 'y' == $raindrops_add_custom_text_extra_sidebar ) {
 
 			add_action( 'raindrops_prepend_extra_sidebar', 'raindrops_prepend_default_sidebar_filter' );
 		}
 
-		function raindrops_prepend_default_sidebar_filter( ){
+		function raindrops_prepend_default_sidebar_filter( ) {
 
 			global $custom_text_default_sidebar;
 
 			echo $custom_text_default_sidebar;
 		}
 
-		function raindrops_prepend_extra_sidebar_filter( ){
+		function raindrops_prepend_extra_sidebar_filter( ) {
 
 			global $custom_text_extra_sidebar;
 
 			echo $custom_text_extra_sidebar;
 		}
 
-		if( $raindrops_display_page_title !== 'y' ){
+		if ( 'y' !== $raindrops_display_page_title ) {
 
 			add_filter( 'raindrops_entry_title',  '__return_null' );
 
 		}
 
-		if( $raindrops_remove_left_margin !== 'y' or $raindrops_add_custom_text_default_sidebar == 'y' ){
+		if ( 'y' !== $raindrops_remove_left_margin || 'y' == $raindrops_add_custom_text_default_sidebar ) {
 
 			$raindrops_devide_column_class= 'yui-b';
-		}else{
+		} else {
 
 			$raindrops_devide_column_class= '';
 		}
 
-		if( $raindrops_remove_left_margin !== 'y' or $raindrops_add_custom_text_extra_sidebar == 'y' ){
+		if ( 'y' !== $raindrops_remove_left_margin || 'y' == $raindrops_add_custom_text_extra_sidebar ) {
 
 			$raindrops_devide_column_extra_class= 'yui-u';
-		}else{
+		} else {
 
 			$raindrops_devide_column_extra_class= '';
 		}
@@ -308,7 +307,8 @@ function raindrops_prepend_extra_sidebar_filter( ){
  *  Widget only home
  *
  */
-		if ( is_home( ) and  is_active_sidebar( 'sidebar-3' ) ) {
+		if ( is_home( ) && is_active_sidebar( 'sidebar-3' ) ) {
+
 			echo '<div class="topsidebar">'."\n".'<ul>';
 			dynamic_sidebar( 'sidebar-3' );
 			echo '</ul>'."\n".'</div>'."\n".'<br class="clear" />';
@@ -319,12 +319,12 @@ function raindrops_prepend_extra_sidebar_filter( ){
 
 				is_2col_raindrops( 'style="width:99%;"' );
 
-				if( $raindrops_devide_column_extra_class !== 'yui-u' ){
+				if ( $raindrops_devide_column_extra_class !== 'yui-u' ) {
 					echo 'style="width:99%;"';
 				}?> >
 
 <?php 
-		if( $show_sticky_post == true ){ 
+		if ( true == $show_sticky_post ) { 
 ?>
       				<div>
 						<ul class="raindrops-sticky-posts">
@@ -335,7 +335,7 @@ function raindrops_prepend_extra_sidebar_filter( ){
  */
 			$the_query = new WP_Query( $raindrops_sticky_post_args );
 
-			while ( $the_query->have_posts( ) ){ $the_query->the_post( );
+			while ( $the_query->have_posts( ) ) { $the_query->the_post( );
 
 					$html = '<div id="post-%1$s" class="%2$s">';
 
@@ -358,8 +358,10 @@ function raindrops_prepend_extra_sidebar_filter( ){
 					$raindrops_excerpt_condition = raindrops_detect_excerpt_condition();
 
 					if ( $raindrops_excerpt_condition == true ) {
+
 						the_excerpt( );
 					} else {
+
 						the_content( esc_html__( 'Continue&nbsp;reading', 'Raindrops' ). ' <span class="meta-nav">&rarr;</span>' );
 					}
 
@@ -378,7 +380,7 @@ function raindrops_prepend_extra_sidebar_filter( ){
         			<br style="clear:both" />
       			</div>
 <?php 
-		if( $raindrops_devide_column_extra_class == 'yui-u' ){
+		if ( $raindrops_devide_column_extra_class == 'yui-u' ) {
 ?>
       			<div class="yui-u">
 <?php 
@@ -394,15 +396,15 @@ function raindrops_prepend_extra_sidebar_filter( ){
 ?>
       			</div>
 <?php 
-	 	}//if( $raindrops_devide_column_class == 'yui-u' )
+	 	}//if ( $raindrops_devide_column_class == 'yui-u' )
 
 	 //add nest grid here 
 ?>
 			</div>
 		</div>
 	</div>
 <?php 
-		if( $raindrops_devide_column_class == 'yui-b' ){
+		if ( 'yui-b' == $raindrops_devide_column_class ) {
 ?>
 	<div class="yui-b">
 <?php
@@ -414,7 +416,7 @@ function raindrops_prepend_extra_sidebar_filter( ){
 ?>
 	</div>
 <?php
-		}//if( $raindrops_devide_column_class == 'yui-b' ) 
+		}//if ( $raindrops_devide_column_class == 'yui-b' ) 
 ?>
 </div>
 <?php get_footer( $raindrops_document_type ); ?>
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,13 @@
 Changelog -----------------------------------
+version:1.143
+	Coding style change
+		syntax change
+			from and to &&
+			from or to ||
+		use Yoda Conditions
+		Remove Trailing Spaces
+----------------------------------------------
+Changelog -----------------------------------
 version:1.142
 	Fixed function name improperly, not prefixed
 		Change 

diff --git a/comments.php b/comments.php
@@ -46,7 +46,7 @@
 ?>
 		</h2>
 <?php
-		if ( get_comment_pages_count( ) > 1 && get_option( 'page_comments' ) ){ // Are there comments to navigate through? 
+		if ( get_comment_pages_count( ) > 1 && get_option( 'page_comments' ) ) { // Are there comments to navigate through? 
 ?>
 		<div id="nav-above-comments" class="clearfix">
     		<span class="nav-previous">
@@ -70,7 +70,7 @@
 ?>
 		</ol>
 <?php
-		if ( get_comment_pages_count( ) > 1 && get_option( 'page_comments' ) ){ // Are there comments to navigate through? 
+		if ( get_comment_pages_count( ) > 1 && get_option( 'page_comments' ) ) { // Are there comments to navigate through? 
 ?>
 		<div id="nav-below-comments" class="clearfix">
 			<span class="nav-previous">
@@ -93,7 +93,7 @@
     /* If there are no comments and comments are closed,
      * let's leave a little note, shall we?
      */
-            if ( ! comments_open( ) ){
+            if ( ! comments_open( ) ) {
 ?>
 		<p class="nocomments">
 <?php 

diff --git a/date.php b/date.php
@@ -38,9 +38,9 @@
 
 		global $wp_query, $wp_rewrite;
 
-		if( $wp_query->query_vars['paged'] > 1 ){ 
+		if ( $wp_query->query_vars['paged'] > 1 ) { 
 			$current 			= $wp_query->query_vars['paged'];
-		}else{
+		} else {
 			$current 			= 1;
 		}
 
@@ -56,15 +56,14 @@
 		$post_per_page_pre		= get_option( 'posts_per_page' );
 		$post_per_page			= apply_filters( 'raindrops_month_list_post_count', $post_per_page_pre );
 
-		if( isset( $ye ) and ! empty( $ye ) and isset( $mo ) and ! empty( $mo ) ){
+		if ( isset( $ye ) && ! empty( $ye ) && isset( $mo ) && ! empty( $mo ) ) {
 
 			$raindrops_page_total = ( int )  ceil( $wp_query->max_num_pages * $post_per_page_pre / $post_per_page );
 
 		} else {
 
 			$raindrops_page_total = $wp_query->max_num_pages;
 		}		
-
 
 		$pagination 			= array(
 									'base' => @add_query_arg( 'paged', '%#%' ),
@@ -75,11 +74,13 @@
 									'type' => 'plain'
 									);
 
-		if( $wp_rewrite->using_permalinks( ) ){
+		if ( $wp_rewrite->using_permalinks( ) ) {
+
 			$pagination['base']     = user_trailingslashit( trailingslashit( remove_query_arg( 's', get_pagenum_link( 1 ) ) ) . 'page/%#%/', 'paged' );
 		}
 
-		if($calendar_page_number == 0 ){
+		if ( 0 == $calendar_page_number ) {
+
 			$calendar_page_number = 1;
 		}
 
@@ -97,7 +98,6 @@
 
 		get_header( $raindrops_document_type );
 		do_action( 'raindrops_pre_'.basename( __FILE__) );
-
 		raindrops_debug_navitation( __FILE__ );
 ?>
 	<div id="yui-main">
@@ -135,7 +135,7 @@
 ?>
 					</div>
 <?php 
-		if( is_month( ) ) {
+		if ( is_month( ) ) {
 ?>
 					<div class="monthly-archives-pagenate">
 <?php
@@ -150,7 +150,7 @@
 <?php 
 		raindrops_prepend_extra_sidebar( );
 
-		if( $rsidebar_show ){
+		if ( $rsidebar_show ) {
 
 			get_sidebar( 'extra' );
 		}

diff --git a/editor-style.css b/editor-style.css
@@ -79,6 +79,4 @@ li.byuser,
 #tinymce img{
 max-width:100%;
 height:auto;
-}
-
-
+}
diff --git a/fonts.css b/fonts.css
@@ -351,5 +351,4 @@ dt,
 }
 .raindrops-comment-link em {
 	font-style: normal;
-}
-
+}