1 files changed, 23 insertions, 29 deletions

diff --git a/site/app/views/users/delete.thtml b/site/app/views/users/delete.thtml
index dbbfa5b..631a640 100644
--- a/site/app/views/users/delete.thtml
+++ b/site/app/views/users/delete.thtml
@@ -37,65 +37,58 @@
  * ***** 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">
     
 <?php if (isset($success) && $success): ?>
-<?=$this->renderElement('notification', array('type' => 'success', 
-'msg' => ___('user_del_header_farewell', 'Farewell!'),
-'description' => sprintf(___('user_del_account_deleted', 'Your user account %1$s '
+    <h1><?=___('user_del_header_farewell', 'Farewell!')?></h1>
+    <p><?php echo sprintf(___('user_del_account_deleted', 'Your user account %1$s '
         .'has been successfully deleted. If you want to come back some time, '
         .'you can re-register on the <a href="%2$s">user registration page</a>.')
-        , $useremail, $html->url('/users/register')))); ?>
+        , $useremail, $html->url('/users/register')); ?></p>
     <p><?=$html->link(_('link_return_to_front_page'), '/');?></p>
 
 <?php else: ?>
-    <?php if (!empty($deleteerror)){
+    <?php if (!empty($deleteerror)): ?>
+    <div class="amo-form-error">
+    <?php
         switch ($deleteerror) {
         case 'addons':
             echo '<p>';
-            echo $this->renderElement('notification', 
-                array('type' => 'error', 
-                'description' => sprintf(___('user_del_error_addons', 'You cannot delete your '
+            echo sprintf(___('user_del_error_addons', 'You cannot delete your '
                 .'account if you are listed as an <a href="%1$s"> author of any '
                 .'add-ons</a>. To delete your account, please have another person '
                 .'in your development group delete you from the list of authors '
                 .'for your add-ons. Afterwards you will be able to delete your account '
-                .'here.'), $html->url("/user/{$userid}"))));
+                .'here.'), $html->url("/user/{$userid}"));
             echo '</p>';
             echo sprintf(___('user_del_error_addons_more_questions', 'If you '
                 .'have additional questions, please contact %1$s for assistance.'),
                 $link->email(EDITOR_EMAIL));
             break;
         case 'checkbox':
-            echo $this->renderElement('notification', 
-                array('type' => 'error', 
-                'description' => ___('user_del_error_checkbox', 'You need to check the box "I '
-                .'understand..." before we can delete your account.')));
+            echo ___('user_del_error_checkbox', 'You need to check the box "I '
+                .'understand..." before we can delete your account.');
             break;
         case 'password':
-            echo $this->renderElement('notification', 
-                array('type' => 'error', 
-                'description' => ___('user_del_error_password', 'Please enter your password '
-                .'correctly in order to perform this step.')));
+            echo ___('user_del_error_password', 'Please enter your password '
+                .'correctly in order to perform this step.');
             break;
         case 'unknown':
         default:
-            echo $this->renderElement('notification', 
-                array('type' => 'error', 
-                'description' => sprintf(___('user_del_error_unknown', 'An unknown error occured '
+            echo sprintf(___('user_del_error_unknown', 'An unknown error occured '
                 .'deleting your account. Please contact %1$s with the issue and '
                 .'we will delete it for you. We apologize for the inconvenience.'),
                 $link->email(ADMIN_EMAIL));
             break;
         }
-    }
     ?>
+    </div>
+    <?php endif; ?>
     
     <h1><?php echo sprintf(___('user_del_header_delete_account', 'Delete User Account %s'), $useremail)?></h1>
     
@@ -106,7 +99,7 @@
     .'now, but contact us at %1$s and we will do our best to assist you in '
     .'solving it.'), $link->email(EDITOR_EMAIL))?></p>
     
-    <div class="highlight">
+    <div class="corner-box">
     <h2><?=___('user_del_header_confirm_deletion', 'Confirm account deletion')?></h2>
     
     <p><?=___('user_del_permanently_removed_means', 'By clicking "delete" your '
@@ -136,4 +129,5 @@
     </div>
     <p><?=$html->link(_('link_return_to_front_page'), '/');?></p>
 <?php endif; ?>
+    </div>
 </div>