1 files changed, 19 insertions, 23 deletions
diff --git a/site/app/views/users/register.thtml b/site/app/views/users/register.thtml
index 6872360..63f82f8 100644
--- a/site/app/views/users/register.thtml
+++ b/site/app/views/users/register.thtml
@@ -38,69 +38,64 @@
  * ***** END LICENSE BLOCK ***** */ 
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary" role="main">
-    <?=$this->renderElement('amo2009/search')?>
+<div id="content">
+    <?=$this->renderElement('search')?>
+    <?=$this->renderElement('sidebar', array('pitch' => true))?>
+    <?=$this->renderElement('app_chooser')?>
+    
+    <div id="content-main">
     
-        <div>
-            <h1><?= ___('user_register_welcome_header') ?></h1>
-            <?= sprintf(___('user_register_details'), 'http://www.mozilla.com/about/legal.html', $html->url('/pages/privacy')) ?>
-        </div>
-
 <?php if(isset($errorMessage)): ?>
-<?=$this->renderElement('notification', array('type' => 'error', 'msg' => _('error_formerrors')));?>
+<div class="amo-form-error"><?php echo _('error_formerrors'); ?></div>
 <p></p>
 <?php 
 endif;
 ?>
 
-<form action="<?=$html->entities($html->url())?>" method="post" class="amo-form">
+<form action="<?=$html->entities($html->url())?>" method="post" class="amo-form corner-box">
     <?=$html->hiddenSession() ?>       
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserEmail"><?=_('user_form_email')?></label>
         <?=$html->input('User/email') ?>
         <?=(isset($error_email_notunique)) ? '<div class="error_message">'._('error_user_email_notunique').'</div>' : $html->tagErrorMsg('User/email', _('error_email_invalid'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserPassword"><?=_('user_form_password')?></label>
         <?=$html->password('User/password') ?>
         <?=$html->tagErrorMsg('User/password', _('error_field_required'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserConfirmpw"><?=_('user_form_confirmpassword')?></label>
         <?=$html->password('User/confirmpw') ?>
         <?=$html->tagErrorMsg('User/confirmpw', _('error_user_confirmpw_nomatch'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserFirstname"><?=_('user_form_firstname')?></label>
         <?=$html->input('User/firstname') ?>
         <?=$html->tagErrorMsg('User/firstname', _('error_field_required'))?>
         <?=___('user_required_firstlast_or_nickname', 'A first name, last name or nickname is required.')?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserLastname"><?=_('user_form_lastname')?></label>
         <?=$html->input('User/lastname') ?>
         <?=$html->tagErrorMsg('User/lastname', _('error_field_required'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserNickname"><?=_('user_form_nickname')?></label>
         <?=$html->input('User/nickname') ?>
         <?=$html->tagErrorMsg('User/nickname', _('error_user_nickname_notunique'))?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserEmailhidden"><?=_('user_form_hideemail')?></label>
         <?=$html->checkBox('User/emailhidden')?>
     </div>
-    <div class="container">
+    <div>
         <label class="amo-label-large" for="UserHomepage"><?=_('user_form_homepage')?></label>
         <?=$html->input('User/homepage') ?>
         <?=$html->tagErrorMsg('User/homepage', _('error_invalid_url'))?>
     </div>
 <?php if (isset($this->controller->Recaptcha) && $this->controller->Recaptcha->enabled): ?>
-    <div class="container">
+    <div>
         <div class="amo-label-large">
             <label for="recaptcha_response_field"><?=___('recaptcha_label', 'Are you human?')?></label><br/>
             <span id="recaptcha_whatsthis"><a href="javascript:Recaptcha.showhelp()"><?=___('recaptcha_whatsthis', "What's this?")?></a></span>
@@ -109,9 +104,10 @@ endif;
         <?=$html->tagErrorMsg('User/captcha', ___('error_invalid_captcha', 'Invalid captcha, please try again!'))?>
     </div>
 <?php endif; ?>
-    <div class="container">
+    <div>
         <?=$html->submit(_('user_form_submit_register'), array('class'=>'amo-submit')); ?>
     </div>
 </form>
 
+    </div>
 </div>