Bug 633769 - Add final parts for the Firefox Spark promotion (part 2) [r=vingtetun]
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -441,17 +441,23 @@ pref("app.privacyURL", "https://www.mozi
pref("app.creditsURL", "http://www.mozilla.com/%LOCALE%/mobile/credits/");
#if MOZ_UPDATE_CHANNEL == beta
pref("app.featuresURL", "http://www.mozilla.com/%LOCALE%/mobile/beta/features/");
pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/beta/faq/");
#else
pref("app.featuresURL", "http://www.mozilla.com/%LOCALE%/mobile/features/");
pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/faq/");
#endif
+
+pref("app.promo.spark.baseURL", "http://spark.mozilla.org");
+#ifdef MOZ_OFFICIAL_BRANDING
+pref("app.promo.spark.endDate", "2011-04-31");
+#else
pref("app.promo.spark.endDate", "2011-01-01");
+#endif
// Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
pref("security.alternate_certificate_error_page", "certerror");
pref("security.warn_viewing_mixed", false); // Warning is disabled. See Bug 616712.
// Override some named colors to avoid inverse OS themes
pref("ui.-moz-dialog", "#efebe7");
--- a/mobile/chrome/content/aboutHome.xhtml
+++ b/mobile/chrome/content/aboutHome.xhtml
@@ -82,17 +82,17 @@
<img src="chrome://browser/skin/images/throbber.png"/>
</div>
</div>
<div id="footer-wrapper">
<span id="feedback" style="width: &aboutHome.footerWidth;" class="section-row" pref="app.feedbackURL" onclick="openLink(this);" role="button">&aboutHome.giveFeedback;</span><span id="support" style="width: &aboutHome.footerWidth;" class="section-row" pref="app.support.baseURL" onclick="openLink(this);" role="button">&aboutHome.getHelp;</span>
</div>
- <div id="promo"><img src="chrome://branding/content/spark.png"/><span id="promo-label">&aboutHome.promoLabel;</span><span id="promo-button" class="section-row">&aboutHome.promoButton;</span></div>
+ <div id="promo" pref="app.promo.spark.baseURL" onclick="openLink(this);" role="button"><img src="chrome://branding/content/spark.png"/><span id="promo-label">&aboutHome.promoLabel;</span><span id="promo-button" class="section-row">&aboutHome.promoButton;</span></div>
</div>
<!-- l10n hack -->
<div style="display: none">
<span id="text-openalltabs">&aboutHome.openAllTabs;</span>
<span id="text-notabs">&aboutHome.noTabs;</span>
<span id="text-noaddons">&aboutHome.noAddons;</span>
</div>
--- a/mobile/themes/core/aboutHome.css
+++ b/mobile/themes/core/aboutHome.css
@@ -205,16 +205,17 @@ body[dir="rtl"] {
.loading > img {
display: block;
margin: 0 auto;
}
.no-items {
text-align: center;
+ -moz-margin-start: 0 !important;
}
#footer-wrapper {
font-size: 18px;
margin-top: 24px;
text-align: center;
}