0
@@ -1,15 +1,26 @@
0
 <?php get_header(); ?>
0
 
0
-	<div id="content" class="narrowcolumn warp-span-6">
0
+<?php 
0
+  $post = get_post(get_option('warp_userprofile_page'));
0
+  subbar($post); 
0
+?>
0
+
0
+	<div id="content" class="narrowcolumn warp-span-10 warp-last">
0
   <h2><?php echo get_the_title(get_option('warp_userprofile_page')); ?></h2>
0
   <?php
0
     echo get_query_var('person');
0
     $users = Warp_Userprofile::get_users_of_blog();
0
+		$class = "even";
0
     foreach ($users as $user) {      
0
       if (get_usermeta($user->user_id, 'warp_up_public') == 1):
0
+			if ($class == "even") {
0
+			  $class = "odd";
0
+			} else {
0
+			  $class = "even";
0
+			}
0
       // var_dump($user);
0
       ?>
0
-			<div class="profile">
0
+			<div class="profile <?php echo $class; ?>">
0
         <div class="avatar"><?php echo Warp_Userprofile::avatar_for($user); ?></div>
0
         <h3 class='name'><a href="<?php echo Warp_Userprofile::permalink() . $user->user_login; ?>"><?php echo $user->display_name; ?></a></h3>
0
         <h4 class='title'><?php echo get_usermeta($user->user_id, 'warp_up_title'); ?></h4>
0
@@ -21,6 +32,4 @@
0
 
0
   </div>
0
 
0
-<?php get_sidebar(); ?>
0
-
0
 <?php get_footer(); ?>

0
@@ -1,16 +1,22 @@
0
 <?php get_header(); ?>
0
 
0
+<?php 
0
+  $post = get_post(get_option('warp_userprofile_page'));
0
+  subbar($post); 
0
+?>
0
+
0
   <div id="content" class="narrowcolumn warp-span-6">
0
-		<div style='float: right' class="profileback">
0
-			<a href="<?php echo Warp_Userprofile::permalink() ?>"><?php _e( 'See all', 'warp_userprofile' ); ?></a>			
0
-			<?php 
0
-			global $userdata;
0
-			if (current_user_can('edit_users')): ?>
0
-			<br /><a href="<?php echo get_bloginfo('wpurl') . '/wp-admin/user-edit.php?user_id=' . $user->ID ?>"><?php _e( 'Edit profile', 'warp_userprofile' ); ?></a>						
0
-			<?php elseif ($userdata->ID == $user->ID): ?>
0
-				<br /><a href="<?php echo get_bloginfo('wpurl') . '/wp-admin/profile.php' ?>"><?php _e( 'Edit profile', 'warp_userprofile' ); ?></a>						
0
-			<?php endif; ?>
0
-		</div>
0
+		<?php 
0
+		global $userdata;
0
+		if (current_user_can('edit_users')): ?>
0
+  		<div style='float: right' class="profileback">
0
+    		<a href="<?php echo get_bloginfo('wpurl') . '/wp-admin/user-edit.php?user_id=' . $user->ID ?>"><?php _e( 'Edit profile', 'warp_userprofile' ); ?></a>						
0
+  		</div>
0
+		<?php elseif ($userdata->ID == $user->ID): ?>
0
+  		<div style='float: right' class="profileback">
0
+    		<a href="<?php echo get_bloginfo('wpurl') . '/wp-admin/profile.php' ?>"><?php _e( 'Edit profile', 'warp_userprofile' ); ?></a>						
0
+  		</div>
0
+		<?php endif; ?>
0
     <div class="profile">
0
       <div class="avatar"><?php echo Warp_Userprofile::avatar_for($user); ?></div>
0
       <h2 class='name'><?php echo $user->display_name; ?></h2>
0
@@ -41,6 +47,5 @@
0
     </div>
0
 
0
   </div>
0
-<?php get_sidebar(); ?>
0
 
0
 <?php get_footer(); ?>