Replace site name with SITE_NAME constant

6 files changed, 218 insertions, 2 deletions

diff --git a/site/app/config/bootstrap.php b/site/app/config/bootstrap.php
index c414330..9398d2b 100644
--- a/site/app/config/bootstrap.php
+++ b/site/app/config/bootstrap.php
@@ -274,6 +274,9 @@ $app_prettynames = array(
     );
 define('APP_PRETTYNAME', $app_prettynames[APP_SHORTNAME]);
 
+global $SITE_NAME;
+define('SITE_NAME', ___('site_name'));
+
 // Get rid of the temp vars
 unset($webpath, $buf, $lang, $language_config);
 
diff --git a/site/app/config/constants.php b/site/app/config/constants.php
index 134d71a..c84d630 100644
--- a/site/app/config/constants.php
+++ b/site/app/config/constants.php
@@ -39,6 +39,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+
 /**
  * Site URL default
  */
diff --git a/site/app/views/developers/addon_edit_properties.thtml b/site/app/views/developers/addon_edit_properties.thtml
index 55e967f..5efd28a 100644
--- a/site/app/views/developers/addon_edit_properties.thtml
+++ b/site/app/views/developers/addon_edit_properties.thtml
@@ -168,9 +168,10 @@
             <label class="indented"><input type="checkbox" name="data[Addon][sitespecific]" value="1"  <?=($addon['Addon']['sitespecific'] == 1 ? 'checked="checked"' : '')?>/>&nbsp;<?=_('devcp_edit_label_sitespecific')?></label>
             <label class="indented"><input type="checkbox" name="data[Addon][externalsoftware]" value="1" <?=($addon['Addon']['externalsoftware'] == 1 ? 'checked="checked"' : '')?> />&nbsp;<?=_('devcp_edit_label_externalsoftware')?></label>
             <label class="indented"><input type="checkbox" name="data[Addon][binary]" value="1" <?=($addon['Addon']['binary'] == 1 ? 'checked="checked"' : '')?> />&nbsp;<?=___('devcp_edit_properties_label_binary')?></label>
-            
             <h5><?=___('devcp_edit_properties_header_guid')?></h5>
             <p class="smallmargin"><?=___('devcp_edit_properties_guid')?></p>
+            <h5>Add-on GUID</h5>
+            <p class="smallmargin">The GUID of your add-on is specified in its install.rdf and uniquely identifies it. You cannot change your GUID once it is listed on <?=SITE_NAME?>.</p>
             <label class="indented"><tt><?=$addon['Addon']['guid']?></tt></label>
             <?php endif; ?>
         </div>
diff --git a/site/app/views/developers/addon_submit_choose.thtml b/site/app/views/developers/addon_submit_choose.thtml
new file mode 100644
index 0000000..6f714eb
--- /dev/null
+++ b/site/app/views/developers/addon_submit_choose.thtml
@@ -0,0 +1,196 @@
+<?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.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Justin Scott <fligtar@mozilla.com> (Original Author)
+ *
+ * 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 ***** */
+?>
+<div id="content">
+
+    <div style="float: right"><?=$html->link('Cancel and go back', '/developers')?></div>
+    <h1>New Add-on Submission</h1>
+    
+    <div id="submission-area" class="rounded graybox">
+        <div id="listing-selection">
+            <p>Thanks for your interest in submitting your add-on to <?=SITE_NAME?>. We offer two types of listings, explained below. Both options are completely free for you and your users, so please choose the best fit for your needs.</p>
+            <br />
+            <div id="option-hosted" class="listing-option">
+                <h4><a href="#" onclick="setListingType('hosted', this); return false;">Hosted Add-ons: Upload and distribute my add-on through <?=SITE_NAME?></a></h4>
+                <div class="step-selection">
+                    <p class="indented">Hosting your add-on on <?=SITE_NAME?> is the easiest way to handle distribution of your add-on. Your add-on will have a display page, appear in search and browse listings (including in the Firefox 3 Add-ons Manager), and we'll take care of the download and automatic update process. Add-ons hosted on the site must be reviewed by a <?=SITE_NAME?> Editor before they will appear publicly.</p>
+                    <div class="action-button-container"><a href="#" onclick="setListingType('hosted'); return false;" class="action-button rounded" style="float: right;">Host My Add-on</a><div class="recommended-option">Recommended Option</div></div>
+                </div>
+                
+                <div class="step-agreement">
+                    <p><?=_('devcp_review_agreement_please')?></p>
+                    <div class="agreement-text rounded">
+                        <?=$localization->includeLocalPage('developer_agreement')?>
+                        <div class="agreement-buttons">
+                            <input type="button" value="<?=_('devcp_submit_decline_dev_agreement')?>" onclick="resetListingType();" />
+                            <input type="button" value="<?=_('devcp_submit_accept_dev_agreement')?>" onclick="acceptAgreement();"/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <br />
+            <div id="option-listed" class="listing-option">
+                <h4><a href="#" onclick="setListingType('listed', this); return false;">Listed Add-ons: Create a listing, but host and manage the add-on on my own site</a></h4>
+                <div class="step-selection">
+                    <p class="indented">Listing your add-on allows you to publicize your creation in the official source for <?=APP_PRETTYNAME?> Add-ons, but lets you retain control of releases and file hosting. Add-ons that are only listed need not be be approved by a <?=SITE_NAME?> Editor, but users will be warned that this review has not occurred.</p>
+                    <div class="action-button-container" style="text-align: right;"><a href="#" onclick="setListingType('listed'); return false;" class="action-button rounded">List My Add-on</a></div>
+                </div>
+                
+                <div class="step-agreement">
+                    <p><?=_('devcp_review_agreement_please')?></p>
+                    <div class="agreement-text rounded">
+                        <?=$localization->includeLocalPage('developer_agreement_listing')?>
+                        <div class="agreement-buttons">
+                            <input type="button" value="<?=_('devcp_submit_decline_dev_agreement')?>" onclick="resetListingType();" />
+                            <input type="button" value="<?=_('devcp_submit_accept_dev_agreement')?>" onclick="acceptAgreement();"/>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            
+            <div>
+                <h5 id="compare-link">Having trouble deciding? <a href="#" onclick="compareOptions(); return false;">Compare options</a>.</h5>
+                
+                <div id="compare-area">
+                    <table id="compare-table">
+                        <tr><td width="70%" valign="top"><table id="compare-chart">
+                        <tr>
+                            <th class="description"><h4>Listing Comparison</h4> (<a href="#" onclick="hideCompare(); return false;">hide</a>)</th>
+                            <th>Hosted Add-ons</th>
+                            <th>Listed Add-ons</th>
+                        </tr>
+                        <tr class="alt" onmouseover="compareOver('display', this);" onmouseout="compareOut(this);">
+                            <td class="description">Add-on Display Page</td>
+                            <td><?=$html->image('developers/tick.png', array('alt' => 'Supported'))?></td>
+                            <td><?=$html->image('developers/tick.png', array('alt' => 'Supported'))?></td>
+                        </tr>
+                        <tr onmouseover="compareOver('searchbrowse', this);" onmouseout="compareOut(this);">
+                            <td class="description">Appear in Search and Browse Listings</td>
+                            <td><?=$html->image('developers/tick.png', array('alt' => 'Supported'))?></td>
+                            <td><?=$html->image('developers/tick.png', array('alt' => 'Supported'))?></td>
+                        </tr>
+                        <tr class="alt" onmouseover="compareOver('addonsmgr', this);" onmouseout="compareOut(this);">
+                            <td class="description">Available in Firefox 3 Add-ons Manager</td>
+                            <td><?=$html->image('developers/tick.png', array('alt' => 'Supported'))?></td>
+                            <td><?=$html->image('developers/tick.png', array('alt' => 'Supported'))?></td>
+                        </tr>
+                        <tr onmouseover="compareOver('downloads', this);" onmouseout="compareOut(this);">
+                            <td class="description">File Hosting and Downloads Handled</td>
+                            <td><?=$html->image('developers/tick.png', array('alt' => 'Supported'))?></td>
+                            <td>&nbsp;</td>
+                        </tr>
+                        <tr class="alt" onmouseover="compareOver('updates', this);" onmouseout="compareOut(this);">
+                            <td class="description">Automatic Updates Handled</td>
+                            <td><?=$html->image('developers/tick.png', array('alt' => 'Supported'))?></td>
+                            <td>&nbsp;</td>
+                        </tr>
+                        <tr onmouseover="compareOver('stats', this);" onmouseout="compareOut(this);">
+                            <td class="description">Detailed Statistics</td>
+                            <td><?=$html->image('developers/tick.png', array('alt' => 'Supported'))?></td>
+                            <td>&nbsp;</td>
+                        </tr>
+                    </table></td><td id="compare-details" valign="top">
+                    <div id="compare-details-text">
+                        <div id="compare-details-display">
+                            Display pages are the core of your add-on's presence...
+                        </div>
+                        <div id="compare-details-searchbrowse">
+                            Your add-on will appear when a user searches for...
+                        </div>
+                        <div id="compare-details-addonsmgr">
+                            The new Add-ons Manager in Firefox 3...
+                        </div>
+                        <div id="compare-details-downloads">
+                            When a user decides to install your add-on, ...
+                        </div>
+                        <div id="compare-details-updates">
+                            Every 24 hours, Firefox checks for...
+                        </div>
+                        <div id="compare-details-stats">
+                            When a user downloads your add-on or checks for updates...
+                        </div>
+                    </div>
+                    </td></tr></table>
+                    
+                    <p><i>Hover over a feature to see details.</i></p>
+                </div>
+            </div>
+        </div><!-- /#listing-selection -->
+        
+        <div id="file-upload">
+            <h3>Hosted File Upload</h3>
+            <p>Upload your add-on file using the form below. If you have multiple files to upload, choose one and you will be able to upload others later.</p>
+            <br />
+            <form id="upload-form" method="POST" enctype="multipart/form-data" action="<?=$html->url('/developers/json/fileupload')?>" target="upload-frame" onsubmit="return uploadFile();">
+            <label>Add-on File: <input id="upload-field" type="file" name="file" /></label>
+            <input type="submit" value="Upload File" style="font-weight: bold;" />
+            <div id="upload-loading"><?=$html->image('ajax_loading.gif')?>&nbsp;Uploading file...</div>
+            </form>
+            <div id="upload-error" class="redbox-tr"><div class="redbox-tl">
+                <div id="upload-error-content">
+                    <h4>Oops! There seems to be a problem with this file...</h4>
+                    <p id="upload-error-text"></p>
+                    <p>Please correct this problem and upload your file again.</p>
+                </div>
+                <div class="redbox-br"><div class="redbox-bl"></div></div>
+            </div></div>
+        </div><!-- /#file-upload -->
+        
+        <div id="listing-info">
+            <h3>Listed Add-on Information</h3>
+            <p>Under construction! You probably should choose <a href="javascript:window.location.reload();">another option</a>, yo!</p>
+        </div><!-- /#listing-info -->
+        
+    </div><!-- /#submission-area -->
+    
+    <div id="addon-created" class="greenbox-tr"><div class="greenbox-tl">
+        <div id="addon-created-content">
+            <h3>Add-on Created!</h3>
+            <div id="created-results">
+                <p>Your add-on has been successfully created. The basic information obtained from your uploaded file has been stored, but there's a lot more to your listing that can be customized.</p>
+                <p>Your add-on is currently marked as <strong>Incomplete</strong>. Please edit your add-on's information using the link below, and when you are finished, move it to the experimental sandbox area where the world will be able to access it.</p>
+                
+                <div class="action-button-container centered"><a id="complete-link" href="#" class="action-button rounded">Complete My Add-on</a></div>
+                <div style="text-align: center;"><a href="<?=$html->url('/developers')?>">I'll complete my add-on later.</a></div>
+            </div>
+        </div>
+        <div class="greenbox-br"><div class="greenbox-bl"></div></div>
+    </div></div><!-- /#addon-created -->
+</div><!-- /#content -->
+
+<iframe id="upload-frame" name="upload-frame" src="" style="display: none;"></iframe>
diff --git a/site/app/views/developers/dashboard.thtml b/site/app/views/developers/dashboard.thtml
index 2fba02b..d288a3f 100644
--- a/site/app/views/developers/dashboard.thtml
+++ b/site/app/views/developers/dashboard.thtml
@@ -110,6 +110,10 @@
             echo '<h4>'.___('devcp_dashboard_header_welcome').'</h4>';
             echo '<p>'.___('devcp_dashboard_learn').'</p>';
             echo '<div style="text-align: center;"><a href="'.$html->url('/developers/addon/submit').'" class="action-button rounded">'.___('devcp_dashboard_start').'</a></div>';
+
+            echo '<h4>Welcome to the Developer Dashboard</h4>';
+            echo '<p>You don\'t currently have any add-ons hosted on '.SITE_NAME.'. To learn how the process works and submit your first add-on, click Get Started below.</p>';
+            echo '<div style="text-align: center;"><a href="'.$html->url('/developers/addon/submit').'" class="action-button rounded">Get Started</a></div>';
             echo '</div>';
         }
         ?>
diff --git a/site/app/views/developers/uploader.thtml b/site/app/views/developers/uploader.thtml
index f14802f..6d5c425 100644
--- a/site/app/views/developers/uploader.thtml
+++ b/site/app/views/developers/uploader.thtml
@@ -66,6 +66,17 @@
             <h3><?=___('devcp_uploader_header_how')?></h3>
             <?=___('devcp_uploader_how')?>
             <div style="text-align: center;"><a href="#" onclick="upload.showAgreement(); return false;" class="action-button rounded"><?=___('devcp_uploader_a_start')?></a></div>
+
+            <h3>How does it all work?</h3>
+            <p>Thanks for your interest in submitting your add-on to <?=SITE_NAME?>. Hosting your add-on on <?=SITE_NAME?> is the easiest way to handle distribution of your add-on. Here's what you'll get:</p>
+            <ul>
+                <li>Each add-on will have a public display page with information you provide, such as a brief summary of the add-on's functionality, an optional longer description, and a showcase of preview screenshots of your add-on.</li>
+                <li>Your add-on will appear in search and browse listings across the site, and even in the Add-ons Manager of Firefox 3.</li>
+                <li>We'll take care of hosting all of your downloads and providing automatic updates to users when you upload a new version.</li>
+                <li>You'll have access to a statistics dashboard with detailed information about your user base.</li>
+            </ul>
+            <p>Add-ons hosted on the site must be reviewed by a <?=SITE_NAME?> Editor before they will have all of the features listed above. If you're ready to start the process and have your add-on package ready for upload, just click on "Get Started" below!</p>
+            <div style="text-align: center;"><a href="#" onclick="upload.showAgreement(); return false;" class="action-button rounded">Get Started</a></div>
         </div> <!-- /#step-intro -->
         <div id="step-agreement">
             <p><?=_('devcp_review_agreement_please')?></p>
@@ -149,4 +160,4 @@
 </div><!-- /#content-main -->
 </div><!-- /#content -->
 
-<iframe id="upload-frame" name="upload-frame" src="" onload="iframeLoaded();" style="display: none;"></iframe>
\ No newline at end of file
+<iframe id="upload-frame" name="upload-frame" src="" onload="iframeLoaded();" style="display: none;"></iframe>