Index: unk/xpressme_integration_kit/wp-content/themes/xpress_default/home.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/home.php	(revision 538)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?php 
-	if (xpress_is_multiblog_root()){
-		include dirname(__FILE__) . '/multi_blog.php';
-	} else {
-		include dirname(__FILE__) . '/index.php';
-	}
-?>
Index: unk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog.php	(revision 538)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?php get_header(); ?>
-
-<div id="content" class="widecolumn">			
-	<h3><?php _e('Site News', 'xpress'); ?></h3>
-	<ul>
-		<?php 
-		query_posts('showposts=7');
-		if (have_posts()) : ?><?php while (have_posts()) : the_post(); ?>
-		<li><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title();?> </a></li>
-		<?php endwhile; ?><?php endif; ?>
-	</ul>
-	<br />	
-	<h3><?php _e('Blogs List', 'xpress'); ?></h3>
-	<?php
-	$blog_list = get_blog_list( 0, 'all' );
-	echo "<ul>\n";
-	foreach ($blog_list AS $blog) {
-		$url =  'http://' .$blog['domain'] .$blog['path'];
-		$blog_name = get_blog_option( $blog['blog_id'], 'blogname' );
-		$post_count = $blog['postcount'];
-		
-		echo  "<li><a href=\" $url \"> $blog_name </a>  (" . __('post count','xpress') . ":$post_count) </li>";
-	}
-	echo "</ul>\n";
-	?> 
-	<br />
-		
-<?php
-	echo '<h3>' . __('New Entries', 'xpress') . "</h3>\n";
-	$data_array = xpress_grobal_recent_posts();
-	echo "<ul>\n";
-	foreach($data_array as $data){
-		echo '<li>';
-		printf(__('%1$s wrote %2$s in %3$s.','xpress'), $data->post_author,$data->title_link,$data->blog_link);
-		echo "</li>\n";
-	}
-	echo "</ul>\n";
-?>
-
-	<h3><?php _e('Updated Blogs', 'xpress'); ?></h3>
-	<?php
-	$blogs = get_last_updated();
-	if( is_array( $blogs ) ) {
-		?>
-		<ul>
-		<?php foreach( $blogs as $details ) {
-			?><li><a href="http://<?php echo $details[ 'domain' ] . $details[ 'path' ] ?>"><?php echo get_blog_option( $details[ 'blog_id' ], 'blogname' ) ?></a></li><?php
-		}
-		?>
-		</ul>
-		<?php
-	}
-	?>
-	<br />	
-	<?php	
-		$current_uid = get_current_user_id();
-		if (!empty($current_uid)) {
-			$user_info = get_userdata($current_uid);
-			$display_name = $user_info->display_name;
-			echo '<h3>';
-			printf(__('Howdy %s', 'xpress'),$display_name);
-			echo "</h3>\n";
-			echo "<ul>\n";
-		
-			$user_blogs = get_blogs_of_user($current_uid);
-			if( is_array($user_blogs) ) {
-				echo '<li>' . __('Your Blogs list','xpress') ;
-					echo "<ul>\n";
-					foreach( $user_blogs as $blog ) {
-						$url =  'http://' .$blog->domain .$blog->path;
-						$blog_name = $blog->blogname;
-						echo  "<li><a href=\" $url \"> $blog_name </a></li>";
-					}
-					echo "</ul>\n";			
-				echo "</li>\n";
-				wp_register();
-			}
-			echo '<li> <a href="wp-signup.php">' . __('Create a new blog','xpress') .  "</a></li>\n";
-			echo "</ul>\n";			
-		}
-	?>
-
-</div>
-
-<?php get_footer(); ?>
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog_front.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog_front.php	(revision 539)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog_front.php	(revision 539)
@@ -0,0 +1,91 @@
+<?php
+/*
+Template Name: MultiBlog Front_Page
+*/
+?>
+<?php get_header(); ?>
+
+<div id="content" class="widecolumn">			
+	<h3><?php _e('Site News', 'xpress'); ?></h3>
+	<ul>
+		<?php 
+		query_posts('showposts=7');
+		if (have_posts()) : ?><?php while (have_posts()) : the_post(); ?>
+		<li><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title();?> </a></li>
+		<?php endwhile; ?><?php endif; ?>
+	</ul>
+	<br />	
+	<h3><?php _e('Blogs List', 'xpress'); ?></h3>
+	<?php
+	$blog_list = get_blog_list( 0, 'all' );
+	echo "<ul>\n";
+	foreach ($blog_list AS $blog) {
+		$url =  'http://' .$blog['domain'] .$blog['path'];
+		$blog_name = get_blog_option( $blog['blog_id'], 'blogname' );
+		$post_count = $blog['postcount'];
+		
+		echo  "<li><a href=\" $url \"> $blog_name </a>  (" . __('post count','xpress') . ":$post_count) </li>";
+	}
+	echo "</ul>\n";
+	?> 
+	<br />
+		
+<?php
+	echo '<h3>' . __('New Entries', 'xpress') . "</h3>\n";
+	$data_array = xpress_grobal_recent_posts();
+	echo "<ul>\n";
+	foreach($data_array as $data){
+		echo '<li>';
+		printf(__('%1$s wrote %2$s in %3$s.','xpress'), $data->post_author,$data->title_link,$data->blog_link);
+		echo "</li>\n";
+	}
+	echo "</ul>\n";
+?>
+	<br />
+
+	<h3><?php _e('Updated Blogs', 'xpress'); ?></h3>
+	<?php
+	$blogs = get_last_updated();
+	if( is_array( $blogs ) ) {
+		?>
+		<ul>
+		<?php foreach( $blogs as $details ) {
+			?><li><a href="http://<?php echo $details[ 'domain' ] . $details[ 'path' ] ?>"><?php echo get_blog_option( $details[ 'blog_id' ], 'blogname' ) ?></a></li><?php
+		}
+		?>
+		</ul>
+		<?php
+	}
+	?>
+	<br />	
+	<?php	
+		$current_uid = get_current_user_id();
+		if (!empty($current_uid)) {
+			$user_info = get_userdata($current_uid);
+			$display_name = $user_info->display_name;
+			echo '<h3>';
+			printf(__('Howdy %s', 'xpress'),$display_name);
+			echo "</h3>\n";
+			echo "<ul>\n";
+		
+			$user_blogs = get_blogs_of_user($current_uid);
+			if( is_array($user_blogs) ) {
+				echo '<li>' . __('Your Blogs list','xpress') ;
+					echo "<ul>\n";
+					foreach( $user_blogs as $blog ) {
+						$url =  'http://' .$blog->domain .$blog->path;
+						$blog_name = $blog->blogname;
+						echo  "<li><a href=\" $url \"> $blog_name </a></li>";
+					}
+					echo "</ul>\n";			
+				echo "</li>\n";
+				wp_register();
+			}
+			echo '<li> <a href="wp-signup.php">' . __('Create a new blog','xpress') .  "</a></li>\n";
+			echo "</ul>\n";			
+		}
+	?>
+
+</div>
+
+<?php get_footer(); ?>
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog_index.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog_index.php	(revision 539)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/multi_blog_index.php	(revision 539)
@@ -0,0 +1,81 @@
+<?php
+/*
+Template Name: MultiBlog Index_Page
+*/
+?><?php get_header(); ?>
+
+		
+<div id="xpress_wrap">				
+	<?php
+		if(xpress_is_theme_sidebar_disp()) {
+			echo '<div id="xpress_content" class="narrowcolumn">';	
+		} else {
+			echo '<div id="xpress_content" class="narrowcolumn_nonside">';
+		}	
+	?>				
+		<?php if (have_posts()) : ?>
+			<div class="xpress-navi-bar">
+				<?php if(function_exists('wp_pagenavi')) : ?>			
+					<div class="xpress_pagenavi"><?php wp_pagenavi(); ?></div>
+				<?php else : ?>
+					<div class="alignleft"><?php xpress_left_arrow_posts_link('echo=1'); ?></div>
+					<div class="alignright"><?php xpress_right_arrow_posts_link('echo=1'); ?></div>
+				<?php endif; ?>
+			</div>
+				
+			<?php while (have_posts()) : the_post(); ?>
+
+				<div class="xpress-post" id="post-<?php the_ID(); ?>">
+					<div class ="xpress-post-header">
+						<?php if (function_exists('hotDates')) { hotDates(); }?>
+						<div class ="xpress-post-title">
+							<?php if(function_exists('the_title_attribute')) : ?>			
+								<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2>
+							<?php else : ?>
+								<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title('','',false)); ?>"><?php the_title(); ?></a></h2>
+							<?php endif; ?>
+						</div>
+					</div>
+					<div class="xpress-post-entry">
+						<?php xpress_the_content(); ?>
+					</div>
+					<div class="xpress-link-pages"><?php wp_link_pages() ?></div>
+					<div class ="xpress-post-footer">
+					<?php
+						the_time('Y/m/d l');
+						echo ' - ';
+						the_author_posts_link();
+						echo ' (' . xpress_post_views_count('post_id=' . $post->ID . '&format=' . __('Views :%d', 'xpress'). '&echo=0') . ')'; 
+						echo ' | ';
+						// echo the_tags(__('Tags:', 'xpress') . ' ', ', ', ' | ');
+						printf(__('Posted in %s', 'xpress'), get_the_category_list(', '));
+						echo ' | ';
+						edit_post_link(__('Edit', 'xpress'), '', ' | ');
+						comments_popup_link(__('No Comments &#187;', 'xpress'), __('1 Comment &#187;', 'xpress'), __('% Comments &#187;', 'xpress'), '', __('Comments Closed', 'xpress') );
+					?>
+					</div>
+				</div>
+
+			<?php endwhile; ?>
+				
+			<div class="xpress-navi-bar">
+				<?php if(function_exists('wp_pagenavi')) : ?>			
+					<div class="xpress_pagenavi"><?php wp_pagenavi(); ?></div>
+				<?php else : ?>
+					<div class="alignleft"><?php xpress_left_arrow_posts_link('echo=1'); ?></div>
+					<div class="alignright"><?php xpress_right_arrow_posts_link('echo=1'); ?></div>
+				<?php endif; ?>
+			</div>
+				
+		<?php else : ?>
+
+			<h2 class="center"><?php _e('Not Found', 'xpress'); ?></h2>
+			<p class="center"><?php _e('Sorry, but you are looking for something that isn&#8217;t here.', 'xpress'); ?></p>
+			<?php include (get_template_directory() . "/searchform.php"); ?>
+
+		<?php endif; ?>
+	</div>
+</div>
+<?php if(xpress_is_theme_sidebar_disp()) get_sidebar(); ?>
+
+<?php get_footer(); ?>