Index: trunk/wp-content/themes/xpress_default/index.php
===================================================================
--- trunk/wp-content/themes/xpress_default/index.php	(revision 96)
+++ trunk/wp-content/themes/xpress_default/index.php	(revision 140)
@@ -1,74 +1,86 @@
 <?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">';
+	}	
+?>
+		<div class="xpress-header-bar">
+			<div class="xpress-header-title">
+				<a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a>
+			</div>
+			<div class="xpress-conditional-title">
+				&nbsp;( <?php xpress_conditional_title();?> )
+			</div>
+			<div class="xpress-description">
+				<?php bloginfo('description'); ?>
+			</div>
+			<div class="xpress-operation-link">
+				<a href="<?php echo get_option('home'); ?>/"><?php _e('Mein Page','xpress')?></a> 
+				<?php if(is_xpress_contributor()) { echo ' | ' ; xpress_post_new_link(__('Post New','xpress')); }?>
+			</div>
+		</div>
+		<hr class="xpress-border">
+		<?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="xpress-next-posts-link"><?php next_posts_link(__('&laquo; Older Entries', 'xpress')) ?></div>
+					<div class="xpress-previous-posts-link">&nbsp;<?php previous_posts_link(__('Newer Entries &raquo;', 'xpress')) ?></div>
+				<?php endif; ?>
+			</div>
+				
+			<?php while (have_posts()) : the_post(); ?>
 
-       <div id="xpress_wrap">
-	   
-	<?php if(xpress_is_theme_sidebar_disp()) : ?>
-	   
-		<div id="xpress_content" class="narrowcolumn">
-		
-	<?php else : ?>
-	
-		<div id="xpress_content" class="narrowcolumn_nonside">
-		
-	<?php endif; ?>
-
-    <div id="xpress_header">
-    	<div id="xpress_headerimg">
-    		<h1><a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a></h1>
-    		<div class="description"><?php bloginfo('description'); ?></div>
-    	</div>
-    </div>
-
-	<?php if (have_posts()) : ?>
-
-		<?php while (have_posts()) : the_post(); ?>
-
-			<div class="post" id="post-<?php the_ID(); ?>">
-				<?php if (function_exists('hotDates')) { hotDates(); }?>
-				<h2><a href="<?php the_permalink() ?>" rel="bookmark" <?php if(function_exists('the_title_attribute')) : ?> title=' <?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>'<?php endif; ?>><?php the_title(); ?></a></h2>
-				<small><?php the_time(__('F jS, Y', 'xpress')) ?> <!-- by <?php the_author() ?> --></small>
-
-				<div class="entry">
-					<?php xpress_the_content(__('Read the rest of this entry &raquo;') ); ?>
+				<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">
+							<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>
+						</div>
+					</div>
+					<div class="xpress-post-entry">
+						<?php xpress_the_content(__('Read the rest of this entry &raquo;') ); ?>
+					</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,__('Views :%d', 'xpress'),false) . ')'; 
+						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>
 
-				<p class="postmetadata"><!-- Post author start -->
-				<!-- Post author end -->
-				<?php
-					if(function_exists('the_tags'))
-						echo the_tags(__('Tags:', 'xpress') . ' ', ', ', '<br />');
-					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') );
-				?>
-				</p>
-				<?php xpress_post_views_count($post->ID,__('Views :%d', 'xpress'),true) ?>
+			<?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="xpress-next-posts-link"><?php next_posts_link(__('&laquo; Older Entries', 'xpress')) ?></div>
+					<div class="xpress-previous-posts-link">&nbsp;<?php previous_posts_link(__('Newer Entries &raquo;', 'xpress')) ?></div>
+				<?php endif; ?>
+			</div>
+				
+		<?php else : ?>
 
-				</div>
+			<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 endwhile; ?>
-		<?php if(function_exists('wp_pagenavi')) : ?>
-			<div class="xpress_pagenavi">
-				<?php wp_pagenavi(); ?>
-			</div>
-		<?php else : ?>
-			<div class="xpress_index_navigation">
-				<div class="alignleft"><?php next_posts_link(__('&laquo; Older Entries', 'xpress')) ?></div>
-				<div class="alignright"><?php previous_posts_link(__('Newer Entries &raquo;', 'xpress')) ?></div>
-			</div>
 		<?php endif; ?>
-	<?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 get_sidebar(); ?>
-
+</div>
+<?php if(xpress_is_theme_sidebar_disp()) get_sidebar(); ?>
+<hr class="xpress-border">
 <?php get_footer(); ?>