Fix various views by removing some stuff and replacing Mozillas by Instantbirds.

site/app/views/addons/display.thtml

@@ -420,21 +420,6 @@
      <?php endif; ?>
 
     </div>
-    <!-- /#more-addons-->
-    <div class="collections-add">
-        Add to a collection:
-        <form action="<?= $html->url('/collections/addtocollection') ?>" method="post">
-            <?=$html->hiddenSession() ?>
-            <input id="addon_id" name="data[addon_id]" type="hidden" value="<?= $addon['Addon']['id'] ?>" />
-            <select name="data[collection_uuid]">
-                <?php foreach($userCollections as $collection) { ?>
-                    <option value="<?=$collection['Collection']['uuid'] ?>"><?=$collection['Translation']['name']['string'] ?></option>
-                <?php } ?>
-            </select>
-            <p><input type="submit" value="Do it &rarr;" /></p>
-        </form>
-    </div>
-
   
     </div>
     <!-- /#content-extra -->

site/app/views/compatibility/dashboard.thtml

@@ -119,7 +119,7 @@
             <?php if ($loggedin): ?>
                 <div class="details-link"><a href="#" onclick="compatibility.viewDeveloperDetails();"><?=___('compatibility_developers_check_status', 'Check Status of My Add-ons')?></a></div>
             <?php else: ?>
-                <p class="login"><?=sprintf(___('compatibility_developers_login_first', 'If you have add-ons hosted on Mozilla Add-ons, <a href="%1$s">please login</a> to analyze the status of your add-ons for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}")?></p>
+                <p class="login"><?=sprintf(___('compatibility_developers_login_first', 'If you have add-ons hosted on Instantbird Add-ons, <a href="%1$s">please login</a> to analyze the status of your add-ons for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}")?></p>
             <?php endif; ?>
         </div>
         

site/app/views/compatibility/developers.thtml

@@ -68,11 +68,11 @@ if ($loggedin) {
         echo '</ul>';
     }
     else {
-        echo '<p class="login">'.___('compatibility_developers_no_addons', 'You do not have any add-ons hosted on Mozilla Add-ons.').'</p>';
+        echo '<p class="login">'.___('compatibility_developers_no_addons', 'You do not have any add-ons hosted on Instantbird Add-ons.').'</p>';
     }
 }
 else {
-    echo '<p class="login">'.sprintf(__('compatibility_developers_login_first', 'If you have add-ons hosted on Mozilla Add-ons, <a href="%1$s">please login</a> to analyze the status of your add-ons for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}").'</p>';
+    echo '<p class="login">'.sprintf(__('compatibility_developers_login_first', 'If you have add-ons hosted on Instantbird Add-ons, <a href="%1$s">please login</a> to analyze the status of your add-ons for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}").'</p>';
 }
 ?>
 <?php if ($format != 'ajax'): ?>

site/app/views/developers/discuss.thtml

@@ -43,7 +43,7 @@
         <h3><?=sprintf(___('devcp_discuss_pagetitle', 'Provide More Information For the Add-on Review of %1$s'), $addonName)?></h3>
         
         
-        <p><?=sprintf(___('devcp_discuss_intro', 'A Mozilla Add-ons Editor requested further '
+        <p><?=sprintf(___('devcp_discuss_intro', 'A Instantbird Add-ons Editor requested further '
             .'information from you regarding version %2$s of your add-on %1$s.'), $addonName, $versionno)?></p>
         
         <div class="corner-box">

site/app/views/elements/app_chooser.thtml

@@ -36,19 +36,3 @@
  *
  * ***** END LICENSE BLOCK ***** */ 
 
-global $app_shortnames, $app_prettynames;
-$applist = array();
-foreach (array_keys($app_shortnames) as $_app) {
-    // pulling fennec from app_chooser until it has proper support for the web site
-    if ($app_shortnames[$_app] == APP_ID || $app_shortnames[$_app] == APP_FENNEC) continue; // don't show current app or fennec
-    $applist[] = '<li id="app-'.$_app.'"><a href="'.$html->url("/$_app/",false,true,false).'">'.$app_prettynames[$_app].'</a></li>';
-}
-?>
-<div id="other-apps" title="<?=___('other_apps_tooltip');?>">
-        <h3><?=_('addons_home_other_applications')?></h3>
-        <ul id="nav-apps">
-            <?php foreach ($applist as $_app): ?>
-            <?=$_app?>
-            <?php endforeach; ?>
-        </ul>
-</div>

site/app/views/elements/header.thtml

@@ -102,7 +102,7 @@
 ?>
 
 <div id="branding">
-  <h4 id="moz"><a href="http://www.mozilla.com/<?=LANG?>/" title="mozilla.com" accesskey="1"><?=$html->image('template/moz-com-logo.png', array('alt' => 'Mozilla Corporation', 'title' => 'Mozilla Corporation', 'height' => '38', 'width' => '89'))?></a></h4>
+  <h4 id="moz"><a href="http://www.instantbird.com/" title="instantbird.com" accesskey="1"><?=$html->image('template/moz-com-logo.png', array('alt' => 'Instantbird Official Website', 'title' => 'Instantbird Official Website', 'height' => '38', 'width' => '89'))?></a></h4>
   
 <?php if (isset($bigHeader) && $bigHeader) { ?>
     <div id="page-title" class="<?=APP_SHORTNAME?>">
@@ -123,7 +123,7 @@
             <?php echo $html->image('app-icons/'.LAYOUT_NAME.'.png', array('alt' => $main_header)); ?>
             <?php
             if (LAYOUT_NAME == 'generic' || LAYOUT_NAME == 'developers') {
-                echo 'Mozilla Add-ons</a></h1>';
+                echo 'Instantbird Add-ons</a></h1>';
                 if (!empty($subpagetitle)) {
                     echo '<h2>'.$subpagetitle.'</h2>';
                 }

site/app/views/elements/install.thtml

@@ -96,22 +96,6 @@ if (count($addonFiles) < 1) {
     
     $versionId = $addonFiles[0]['version_id'];
     
-    // If we're looking at thunderbird pages, and there is no EULA, show the TB
-    // install instructions.  Bug 401272 fixed the button so it downloads instead of
-    // installs, but it doesn't hurt to have these instructions still.
-    if (APP_ID == APP_THUNDERBIRD && empty($addonEULA) && $showInstructions) {
-        echo '<div class="app_install">';
-        echo '<h3>'._('addons_install_in_thunderbird_title').'</h3>';
-        echo _('addons_install_in_thunderbird');
-        echo '</div>';
-    }
-    if (APP_ID == APP_SUNBIRD && empty($addonEULA) && $showInstructions) {
-        echo '<div class="app_install">';
-        echo '<h3>'._('addons_install_in_sunbird_title').'</h3>';
-        echo _('addons_install_in_sunbird');
-        echo '</div>';
-    }
-    
     echo '<div id="install-'.$versionId.'" class="install-container">';
     foreach ($addonFiles as $file) {
         // never display files with invalid statuses (bug 427176)

site/app/views/elements/search.thtml

@@ -58,12 +58,16 @@ if (!isset($appid)) {
 } 
 
 $min_display_version_by_app = array( // eventually this information should be kept in DB
-    APP_INSTANTBIRD => "0.2",
+    APP_INSTANTBIRD => "0.2"
 );
 
 $new_versions = array();
 foreach ($app_shortnames as $n => $k) {
 // AmoVersions is from controller->beforeRender()
+    if (!empty($AmoVersions[$k])) foreach ($AmoVersions[$k] as $version) {
+        $versions_parts = explode(".", $version);
+        $second_part = (isset($versions_parts[1])) ? ".".intval($versions_parts[1]) : "";
+    }
     if (!empty($new_versions[$k]))
         $new_versions[$k] = array_unique($new_versions[$k]);
 }

site/app/views/layouts/ajax_with_css.thtml

@@ -45,7 +45,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <base target="_top">
     <?=$html->css('rustico')?>
-    <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false)?>" title="Mozilla Add-ons" />
+    <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false)?>" title="Instantbird Add-ons" />
     <link rel="shortcut icon" href="<?=$html->url('/img/favicon.ico', null, false)?>" type="image/x-icon" />
     <?php
         if (!empty($cssAdd)) {

site/app/views/layouts/mozilla.thtml

@@ -83,7 +83,7 @@
     }
 ?>
     
-    <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false, false)?>" title="Mozilla Add-ons"/>
+    <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false, false)?>" title="Instantbird Add-ons"/>
     <?php if (isset($addon) && ($addon['Addon']['addontype_id'] == ADDON_SEARCH)) : ?>
         <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->urlFile($addon['Version'][0]['File'][0]['id'], $addon['Version'][0]['File'][0]['filename'])?>" locale="<?=$addon['Translation']['name']['locale']?>" title="<?=$addon['Translation']['name']['string']?>"/>
     <?php endif; ?>

site/app/views/layouts/rss.thtml

@@ -7,7 +7,7 @@
         <language><?=strtolower(LANG) ?></language>
         <pubDate><?=$time->toRss(gmmktime()) ?></pubDate>
         <docs>http://blogs.law.harvard.edu/tech/rss</docs>
-        <generator>Mozilla Add-ons</generator>
+        <genInstantbirdMozilla Add-ons</generator>
         
         <?php echo $content_for_layout; ?>
 

site/app/views/layouts/tests.thtml

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" version="-//W3C//DTD XHTML 1.1//EN" xml:lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>AMO Tests</title>
+    <title>AIO Tests</title>
     <?=$html->css('tests')?>
     <?=$html->css('admin')?>
     <?=$javascript->link('jquery-compressed.js')?>
@@ -11,7 +11,7 @@
 </head>
 <body>
     <div class="menu">
-        <span class="title">AMO 'Project Remora' Test Suite</span>
+        <span class="title">AIO 'Project Remora' Test Suite</span>
         <span class="items">
             <?=$html->link('Tests Main', '/tests')?> | 
             <?=$html->link('Run All Tests', '/tests/all')?> | 

site/app/views/pages/robots.txt.thtml

@@ -39,7 +39,7 @@
 $this->layout = null;
 header('Content-Type: text/plain');
 ?>
-# robots.txt file for Mozilla Add-ons, addons.mozilla.org
+# robots.txt file for Instantbird Add-ons, addons.instantbird.org
 User-agent: *
 <?php
 /* default: allow access to all pages on prod, disallow on preview */

site/app/views/statistics/rss/summary.thtml

@@ -68,7 +68,7 @@ echo $this->renderElement('rss_listitem', array(
     'title' => sprintf(_('statistics_rss_title_statsfordate'), strftime(_('statistics_rss_title_fulldate'))),
     'url' => SITE_URL.$html->url('/statistics/addon/'.$addon['Addon']['id']),
     'description' => "<![CDATA[{$summary}]]>",
-    'author' => 'Mozilla Add-ons',
+    'author' => 'Instantbird Add-ons',
     'pubDate' => $time->toRss($today),
     'permalink' => SITE_URL.$html->url('/statistics/addon/'.$addon['Addon']['id']).'/'.date('Ymd', $today)
     ));

site/app/views/users/delete.thtml

@@ -92,7 +92,7 @@
     
     <h1><?php echo sprintf(___('user_del_header_delete_account', 'Delete User Account %s'), $useremail)?></h1>
     
-    <p><?=___('user_del_community_sad', 'The Mozilla Add-ons community is sad to see you go.')?></p>
+    <p><?=___('user_del_community_sad', 'The Instantbird Add-ons community is sad to see you go.')?></p>
     
     <p><?php sprintf(___('user_del_specific_problem_editors', 'If you have a '
     .'specific problem we may help you with, please do not delete your account '
@@ -105,7 +105,7 @@
     <p><?=___('user_del_permanently_removed_means', 'By clicking "delete" your '
         .'account is going to be <strong>permanently removed</strong>. That means:')?>
     <ul>
-        <li><?=___('user_del_nologin', 'You will not be able to log into Mozilla Add-ons anymore.')?></li>
+        <li><?=___('user_del_nologin', 'You will not be able to log into Instantbird Add-ons anymore.')?></li>
         <li><?=___('user_del_reviews_anonymized', 'Your reviews and ratings will '
             .'not be deleted, but they will no longer be associated with you.')?></li>
     </ul>