Fake v2 production branchv2

10 files changed, 106 insertions, 164 deletions

diff --git a/site/app/views/pages/about.thtml b/site/app/views/pages/about.thtml
index 4c7befc..548086f 100644
--- a/site/app/views/pages/about.thtml
+++ b/site/app/views/pages/about.thtml
@@ -1,49 +1,14 @@
 <?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is addons.mozilla.org site.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- *
- * Contributor(s):
- *   Jeff Balogh <jbalogh@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" role="main">
-    <?=$this->renderElement('amo2009/search')?>
-
-    <?=$localization->includeLocalPage('about')?>
+<div id="content">
+    <?php
+    echo $this->renderElement('search');
+    echo $this->renderElement('sidebar', array('pitch' => true));
+    echo $this->renderElement('app_chooser');
+    ?>
+    <div id="content-main">
+        <?=$localization->includeLocalPage('about')?>
+    </div>
 </div>
diff --git a/site/app/views/pages/appversions.thtml b/site/app/views/pages/appversions.thtml
index d719204..66120ae 100644
--- a/site/app/views/pages/appversions.thtml
+++ b/site/app/views/pages/appversions.thtml
@@ -20,7 +20,6 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -36,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 
 loadModel('Application');
 loadComponent('Versioncompare');
@@ -68,12 +67,12 @@ foreach ($applications as $application) {
 }
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" 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
     echo '<h1>'._('pages_appversions_header').'</h1>';
@@ -93,4 +92,5 @@ foreach ($applications as $application) {
     echo '<p>'.sprintf(_('pages_appversions_required_files'), $html->link(_('pages_appversions_required_files_link'), 'http://developer.mozilla.org/en/docs/Install_Manifests')).'</p>';
 ?>
 
+    </div>
 </div>
diff --git a/site/app/views/pages/credits.thtml b/site/app/views/pages/credits.thtml
index 409c3c8..e45fe7d 100644
--- a/site/app/views/pages/credits.thtml
+++ b/site/app/views/pages/credits.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Justin Scott <fligtar@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 
 loadModel('Group');
 $groupModel =& new Group();
@@ -89,13 +88,12 @@ ksort($editors);
 ksort($past_developers);
 ksort($other_contributors);
 ?>
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" 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">
 <?=_('credits_intro')?>
 <br/><br/>
 <div class="corner-box">
@@ -142,3 +140,4 @@ ksort($other_contributors);
 <?=sprintf(_('credits_contributing'), $html->link(_('credits_contributing_wikipage'), SITE_WIKI))?>
 
 </div>
+</div>
diff --git a/site/app/views/pages/faq.thtml b/site/app/views/pages/faq.thtml
index 1133b08..5700c14 100644
--- a/site/app/views/pages/faq.thtml
+++ b/site/app/views/pages/faq.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Mike Morgan <morgamic@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,16 +36,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" 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">
     
-    <?=$localization->includeLocalPage('faq')?>
+<?=$localization->includeLocalPage('faq')?>
 
+    </div>
 </div>
diff --git a/site/app/views/pages/js_constants.js.thtml b/site/app/views/pages/js_constants.js.thtml
index aca2ea9..bd61078 100644
--- a/site/app/views/pages/js_constants.js.thtml
+++ b/site/app/views/pages/js_constants.js.thtml
@@ -54,55 +54,33 @@ var APP_SHORTNAME = "<?=APP_SHORTNAME?>";
 var APP_PRETTYNAME = "<?=APP_PRETTYNAME?>";
 var LATEST_FIREFOX_VERSION = '<?=LATEST_FIREFOX_VERSION?>';
 var LATEST_FIREFOX_DEVEL_VERSION = '<?=LATEST_FIREFOX_DEVEL_VERSION?>';
-var APP_FIREFOX = '<?=APP_FIREFOX?>';
-var APP_SEAMONKEY = '<?=APP_SEAMONKEY?>';
-var APP_THUNDERBIRD = '<?=APP_THUNDERBIRD?>';
-var APP_SUNBIRD = '<?=APP_SUNBIRD?>';
-var APP_FENNEC = '<?=APP_FENNEC?>';
-<?php /* generic constants */ ?>
-var KEYCODE_ENTER = 13;
-<?php
-$constants = array(
-    'addOnNotAvailableForPlatform' => ___('addon_not_available_for_platform'),
-    'error_opensearch_unsupported' => ___('addons_searchengines_error_mozilla_browser_required'),
-
-    /* Fallback from 3/19/08 */
-    'app_compat_update_firefox' => ___('app_compat_update_firefox'),
-    'app_compat_try_old_version' => ___('app_compat_try_old_version'),
-    'app_compat_older_firefox_only' => ___('app_compat_older_firefox_only'),
-    'app_compat_unreleased_version' => ___('app_compat_unreleased_version'),
-    'app_compat_older_version_or_ignore_check' => ___('app_compat_older_version_or_ignore_check'),
-
-    /* developers.js */
-    'devcp_js_upload_alert' => ___('devcp_js_upload_alert'),
-    'addons_status_public' => ___('addons_status_public'),
-    'addons_status_sandbox' => ___('addons_status_sandbox'),
-    'addons_status_pending' => ___('addons_status_pending'),
-    'devcp_js_img_move_down' => ___('devcp_js_img_move_down'),
-    'devcp_js_img_move_up' => ___('devcp_js_img_move_up'),
-    'devcp_js_option_owner' => ___('devcp_js_option_owner'),
-    'devcp_js_option_developer' => ___('devcp_js_option_developer'),
-    'devcp_js_option_viewer' => ___('devcp_js_option_viewer'),
-    'devcp_js_input_list_author' => ___('devcp_js_input_list_author'),
-    'devcp_js_sure_remove' => ___('devcp_js_sure_remove'),
-    'devcp_js_remove_author' => ___('devcp_js_remove_author'),
-    'devcp_js_a_cancel' => ___('devcp_js_a_cancel'),
-    'devcp_js_add_email' => ___('devcp_js_add_email'),
-    'devcp_js_img_remove_compat' => ___('devcp_js_img_remove_compat'),
-    'devcp_js_license_select' => ___('devcp_js_license_select'),
-    'devcp_js_license_text' => ___('devcp_js_license_text'),
+var addOnNotAvailableForPlatform = "<?=_('addon_not_available_for_platform')?>";
+var error_opensearch_unsupported = "<?=_('addons_searchengines_error_mozilla_browser_required')?>";
 
-    /* Fallback from 4/14/08 */
-    'app_compat_ignore_check' => ___('app_compat_ignore_check'),
+<?php /* Fallback from 3/19/08 */?>
+var app_compat_update_firefox = '<?=___('app_compat_update_firefox')?>';
+var app_compat_try_old_version = '<?=___('app_compat_try_old_version')?>';
+var app_compat_older_firefox_only = '<?=___('app_compat_older_firefox_only')?>';
+var app_compat_unreleased_version = '<?=___('app_compat_unreleased_version')?>';
+var app_compat_older_version_or_ignore_check = '<?=___('app_compat_older_version_or_ignore_check')?>';
 
-    // collections
-    'collections_edit_submit' => ___('collections_edit_submit'),
-    'collections_edit_submit_deletecollection' => ___('collections_edit_submit_deletecollection'),
+<?php /* developers.js */ ?>
+var devcp_js_upload_alert = '<?=___('devcp_js_upload_alert')?>';
+var addons_status_public = '<?=___('addons_status_public')?>';
+var addons_status_sandbox = '<?=___('addons_status_sandbox')?>';
+var addons_status_pending = '<?=___('addons_status_pending')?>';
+var devcp_js_img_move_down = '<?=___('devcp_js_img_move_down')?>';
+var devcp_js_img_move_up = '<?=___('devcp_js_img_move_up')?>';
+var devcp_js_option_owner = '<?=___('devcp_js_option_owner')?>';
+var devcp_js_option_developer = '<?=___('devcp_js_option_developer')?>';
+var devcp_js_option_viewer = '<?=___('devcp_js_option_viewer')?>';
+var devcp_js_input_list_author = '<?=___('devcp_js_input_list_author')?>';
+var devcp_js_sure_remove = '<?=___('devcp_js_sure_remove')?>';
+var devcp_js_remove_author = '<?=___('devcp_js_remove_author')?>';
+var devcp_js_a_cancel = '<?=___('devcp_js_a_cancel')?>';
+var devcp_js_add_email = '<?=___('devcp_js_add_email')?>';
+var devcp_js_img_remove_compat = '<?=___('devcp_js_img_remove_compat')?>';
 
-    /* addons display page */
-    'addons_display_collection_publish_success' => ___('addons_display_collection_publish_success')
-);
+<?php /* Fallback from 4/14/08 */?>
+var app_compat_ignore_check = '<?=___('app_compat_ignore_check')?>';
 
-foreach ($constants as $var_name => $l10n_string) {
-    echo sprintf('var %s = "%s";'."\n", $var_name, addslashes($l10n_string));
-}
diff --git a/site/app/views/pages/policy.thtml b/site/app/views/pages/policy.thtml
index 23c93ca..de718ec 100644
--- a/site/app/views/pages/policy.thtml
+++ b/site/app/views/pages/policy.thtml
@@ -22,7 +22,6 @@
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
  *   Justin Scott <fligtar@gmail.com>
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -38,16 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" 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">
     
-    <?=$localization->includeLocalPage('policy', array($html->link(_('pages_policy_sandbox_link'), '/pages/sandbox')))?>
+<?=$localization->includeLocalPage('policy', array($html->link(_('pages_policy_sandbox_link'), '/pages/sandbox')))?>
 
+    </div>
 </div>
diff --git a/site/app/views/pages/privacy.thtml b/site/app/views/pages/privacy.thtml
index 23d072a..cccaa88 100644
--- a/site/app/views/pages/privacy.thtml
+++ b/site/app/views/pages/privacy.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,17 +36,18 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" 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">
 
-    <?=$localization->includeLocalPage('privacy')?>
+<?=$localization->includeLocalPage('privacy')?>
 
+    </div>
 </div>
 
diff --git a/site/app/views/pages/review_guide.thtml b/site/app/views/pages/review_guide.thtml
index 8ddd885..d88fd4e 100644
--- a/site/app/views/pages/review_guide.thtml
+++ b/site/app/views/pages/review_guide.thtml
@@ -21,7 +21,6 @@
  *
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,17 +36,18 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" 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">
 
-    <?=$localization->includeLocalPage('reviewguide')?>
+<?=$localization->includeLocalPage('reviewguide')?>
 
+    </div>
 </div>
 
diff --git a/site/app/views/pages/sandbox.thtml b/site/app/views/pages/sandbox.thtml
index 734e8b6..559a4ef 100644
--- a/site/app/views/pages/sandbox.thtml
+++ b/site/app/views/pages/sandbox.thtml
@@ -22,7 +22,6 @@
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
  *   Justin Scott <fligtar@gmail.com>
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -38,16 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" 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">
 
-    <?=$localization->includeLocalPage('sandbox', array('<img src="'.$html->url('/images/localized_image/sandbox-review.png').'">'))?>
+<?=$localization->includeLocalPage('sandbox', array('<img src="'.$html->url('/images/localized_image/sandbox-review.png').'">'))?>
 
+    </div>
 </div>
diff --git a/site/app/views/pages/submissionhelp.thtml b/site/app/views/pages/submissionhelp.thtml
index e615b0f..91adf6c 100644
--- a/site/app/views/pages/submissionhelp.thtml
+++ b/site/app/views/pages/submissionhelp.thtml
@@ -22,7 +22,6 @@
  * Contributor(s):
  *   Frederic Wenzel <fwenzel@mozilla.com> (Original Author)
  *   Justin Scott <fligtar@gmail.com>
- *   Wil Clouser <wclouser@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -38,16 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-$this->layout = 'amo2009';
+$this->layout = 'mozilla';
 ?>
 
-<div class="secondary" role="complementary">
-    <?=$this->renderElement('amo2009/categories')?>
-</div>
-
-<div class="primary prose" 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">
 
-    <?=$localization->includeLocalPage('submission_help', array($html->url('/pages/policy')))?>
+<?=$localization->includeLocalPage('submission_help', array($html->url('/pages/policy')))?>
 
+    </div>
 </div>