1 files changed, 11 insertions, 47 deletions
diff --git a/site/app/views/users/info.thtml b/site/app/views/users/info.thtml
index 659abb6..25c1d0d 100644
--- a/site/app/views/users/info.thtml
+++ b/site/app/views/users/info.thtml
@@ -38,12 +38,11 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
+<div id="content">
+   
+    <?=$this->renderElement('search')?>
 
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+    <div id="content-main">
     
     <h3><?=_('users_info_author_profile')?></h3>
     <dl>
@@ -66,12 +65,7 @@
         <dt><?=_('users_info_email')?></dt>
         <dd><?=$link->email($profile['User']['email'])?></dd>
         <? endif; ?>
-
-        <?php if ($profile['Translation']['bio']['string']): ?>
-        <dt><?=___('users_info_aboutme')?></dt>
-        <dd><?=nl2br($profile['Translation']['bio']['string'])?></dd>
-        <?php endif; ?>
-
+        
         <dt><?=sprintf(_('user_info_usersince'), APP_PRETTYNAME)?></dt>
         <dd><?=strftime(_('date'), strtotime($profile['User']['created']))?></dd>
 
@@ -132,41 +126,11 @@
 </div>
 <?php endif; ?>
 
-<?php if (!empty($coll)): ?>
-<div>
-<h3><?=sprintf(___('users_info_collections_by_user'), $displayName)?></h3>
-<dl>
-    <?php
-    global $app_shortnames;
-    foreach ($coll as &$c):
-    ?>
-    <dt><?= $html->linkNoLocaleNoApp($c['Translation']['name']['string'],
-        sprintf('/%s/%s/collection/%s', LANG, array_search($c['Collection']['application_id'], $app_shortnames),
-            empty($c['Collection']['nickname'])?$c['Collection']['uuid']:$c['Collection']['nickname'])); ?>
-    </dt>
-    <dd><?=$c['Translation']['description']['string']?></dd>
-    <? endforeach; ?>
-</dl>
-</div>
-<?php endif; ?>
-
-<?php if (!empty($coll_fav)): ?>
-<div>
-<h3><?=___('users_info_fav_collections_by_user')?></h3>
-<dl>
-    <?php
-    global $app_shortnames;
-    foreach ($coll_fav as &$c):
-    ?>
-    <dt><?= $html->linkNoLocaleNoApp($c['Translation']['name']['string'],
-        sprintf('/%s/%s/collection/%s', LANG, array_search($c['Collection']['application_id'], $app_shortnames),
-            empty($c['Collection']['nickname'])?$c['Collection']['uuid']:$c['Collection']['nickname'])); ?>
-    </dt>
-    <dd><?=$c['Translation']['description']['string']?></dd>
-    <? endforeach; ?>
-</dl>
-</div>
-<?php endif; ?>
+    </div>
+    <!-- /#content-main -->
 
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+ 
 </div>
-<!-- /#.primary -->
+<!-- /#content -->