[Pkg-mozext-commits] [adblock-plus] 27/41: Issue 2046 - Various improvements of the first-run page
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 18:21:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit 7ebacdc1a5e74bd26c6ec4e080b4e088d853589e
Author: Wladimir Palant <trev at adblockplus.org>
Date: Thu Mar 5 16:11:07 2015 +0100
Issue 2046 - Various improvements of the first-run page
---
background.js | 4 ++
firstRun.html | 157 ++++++++++++++++++++++++------------------------
locale/fr/firstRun.json | 2 +-
skin/firstRun.css | 17 +++++-
4 files changed, 99 insertions(+), 81 deletions(-)
diff --git a/background.js b/background.js
index 1d9bcb8..41b55f2 100644
--- a/background.js
+++ b/background.js
@@ -48,6 +48,10 @@
getDocLink: function(link)
{
return "https://adblockplus.org/redirect?link=" + encodeURIComponent(link);
+ },
+ get appLocale()
+ {
+ return parent.ext.i18n.getMessage("@@ui_locale").replace(/_/g, "-");
}
}
};
diff --git a/firstRun.html b/firstRun.html
index b3b44fc..cb2ec25 100644
--- a/firstRun.html
+++ b/firstRun.html
@@ -38,97 +38,98 @@
<section id="filterlistsReinitializedWarning" class="i18n_firstRun_filterlistsReinitializedWarning warning" hidden="true"></section>
<section id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning warning" hidden="true"></section>
- <section id="acceptable-ads">
- <h2 class="i18n_firstRun_acceptableAdsHeadline"></h2>
- <p id="acceptableAdsExplanation" class="i18n_firstRun_acceptableAdsExplanation"></p>
- </section>
-
-
- <section id="share">
- <h2 id="share-headline" class="i18n_firstRun_share_headline"></h2>
-
- <div id="donate-block">
- <a id="donate" class="i18n_firstRun_donate" target="_blank"></a>
- <span id="donate-label" class="i18n_firstRun_donate_label"></span>
- </div>
-
- <div id="share-block">
- <div id="share-general" class="share-buttons">
- <a id="share-facebook" href="https://www.facebook.com/adblockplus" target="_blank" data-script="https://facebook.com/plugins/like.php?">
- </a>
- <a id="share-twitter" href="https://twitter.com/adblockplus" target="_blank" data-script="https://platform.twitter.com/widgets/">
- </a>
- <a id="share-gplus" href="https://www.google.com/+AdblockPlus" target="_blank" data-script="https://apis.google.com/se/0/_/+1/fastbutton?">
- </a>
+ <div id="content">
+ <section id="acceptable-ads">
+ <h2 class="i18n_firstRun_acceptableAdsHeadline"></h2>
+ <p id="acceptableAdsExplanation" class="i18n_firstRun_acceptableAdsExplanation"></p>
+ </section>
+
+
+ <section id="share">
+ <h2 id="share-headline" class="i18n_firstRun_share_headline"></h2>
+
+ <div id="donate-block">
+ <a id="donate" class="i18n_firstRun_donate" target="_blank"></a>
+ <span id="donate-label" class="i18n_firstRun_donate_label"></span>
</div>
- <!-- Chinese social networks -->
- <div id="share-chinese" class="share-buttons">
- <a id="share-renren" href="http://www.renren.com/601651969" target="_blank">
- </a>
- <a id="share-weibo" href="http://e.weibo.com/adblockplus/" target="_blank">
- </a>
+ <div id="share-block">
+ <div id="share-general" class="share-buttons">
+ <a id="share-facebook" href="https://www.facebook.com/adblockplus" target="_blank" data-script="https://facebook.com/plugins/like.php?">
+ </a>
+ <a id="share-twitter" href="https://twitter.com/adblockplus" target="_blank" data-script="https://platform.twitter.com/widgets/">
+ </a>
+ <a id="share-gplus" href="https://www.google.com/+AdblockPlus" target="_blank" data-script="https://apis.google.com/se/0/_/+1/fastbutton?">
+ </a>
+ </div>
+
+ <!-- Chinese social networks -->
+ <div id="share-chinese" class="share-buttons">
+ <a id="share-renren" href="http://www.renren.com/601651969" target="_blank">
+ </a>
+ <a id="share-weibo" href="http://e.weibo.com/adblockplus/" target="_blank">
+ </a>
+ </div>
+ <span class="i18n_firstRun_share"></span>
</div>
- <span class="i18n_firstRun_share"></span>
- </div>
- </section>
-
-
- <section id="can-do-more">
- <h2 class="i18n_firstRun_features"></h2>
-
- <div id="can-do-more-content">
- <ul id="features">
- <li id="feature-malware" class="feature">
- <div class="feature-image feature-malware-image"></div>
- <div class="feature-description">
- <div class="feature-description-textblock">
- <h3 class="i18n_firstRun_feature_malware feature-title"></h3>
- <span class="i18n_firstRun_feature_malware_description"></span>
- </div>
- <div id="toggle-malware" class="toggle">
- <div class="i18n_firstRun_toggle_on toggle-on"></div>
- <div class="toggle-blob"></div>
- <div class="i18n_firstRun_toggle_off toggle-off"></div>
- </div>
- </div>
-
- </li>
- <li id="feature-social" class="feature">
- <div class="feature-image feature-social-image"></div>
- <div class="feature-description">
- <div class="feature-description-textblock">
- <h3 class="i18n_firstRun_feature_social feature-title"></h3>
- <span class="i18n_firstRun_feature_social_description"></span>
- </div>
- <div id="toggle-social" class="toggle">
- <div class="i18n_firstRun_toggle_on toggle-on"></div>
- <div class="toggle-blob"></div>
- <div class="i18n_firstRun_toggle_off toggle-off"></div>
- </div>
- </div>
- </li>
+ </section>
+
- <li id="feature-tracking" class="feature">
- <div class="feature-image feature-tracking-image"></div>
- <div class="feature-description">
+ <section id="can-do-more">
+ <h2 class="i18n_firstRun_features"></h2>
+
+ <div id="can-do-more-content">
+ <ul id="features">
+ <li id="feature-malware" class="feature">
+ <div class="feature-image feature-malware-image"></div>
+ <div class="feature-description">
<div class="feature-description-textblock">
- <h3 class="i18n_firstRun_feature_tracking feature-title"></h3>
- <span class="i18n_firstRun_feature_tracking_description"></span>
+ <h3 class="i18n_firstRun_feature_malware feature-title"></h3>
+ <span class="i18n_firstRun_feature_malware_description"></span>
</div>
- <div id="toggle-tracking" class="toggle">
+ <div id="toggle-malware" class="toggle">
<div class="i18n_firstRun_toggle_on toggle-on"></div>
<div class="toggle-blob"></div>
<div class="i18n_firstRun_toggle_off toggle-off"></div>
</div>
- </div>
- </li>
+ </div>
- </ul>
+ </li>
+ <li id="feature-social" class="feature">
+ <div class="feature-image feature-social-image"></div>
+ <div class="feature-description">
+ <div class="feature-description-textblock">
+ <h3 class="i18n_firstRun_feature_social feature-title"></h3>
+ <span class="i18n_firstRun_feature_social_description"></span>
+ </div>
+ <div id="toggle-social" class="toggle">
+ <div class="i18n_firstRun_toggle_on toggle-on"></div>
+ <div class="toggle-blob"></div>
+ <div class="i18n_firstRun_toggle_off toggle-off"></div>
+ </div>
+ </div>
+ </li>
+
+ <li id="feature-tracking" class="feature">
+ <div class="feature-image feature-tracking-image"></div>
+ <div class="feature-description">
+ <div class="feature-description-textblock">
+ <h3 class="i18n_firstRun_feature_tracking feature-title"></h3>
+ <span class="i18n_firstRun_feature_tracking_description"></span>
+ </div>
+ <div id="toggle-tracking" class="toggle">
+ <div class="i18n_firstRun_toggle_on toggle-on"></div>
+ <div class="toggle-blob"></div>
+ <div class="i18n_firstRun_toggle_off toggle-off"></div>
+ </div>
+ </div>
+ </li>
- </div>
- </section>
+ </ul>
+ </div>
+ </section>
+ </div>
<footer>
<a id="contributors" class="i18n_firstRun_contributor_credits"></a>
diff --git a/locale/fr/firstRun.json b/locale/fr/firstRun.json
index 412d4fa..190d958 100644
--- a/locale/fr/firstRun.json
+++ b/locale/fr/firstRun.json
@@ -36,7 +36,7 @@
"message": "Naviguer incognito en désactivant le suivi, en masquant vos traces aux publicistes qui traqueraient vos faits et gestes."
},
"firstRun_features": {
- "message": "Adblock Plus peut faire plus que bloquer les pubs"
+ "message": "Pour terminer l'installation, choisissez un niveau de protection de votre vie privée"
},
"firstRun_filterlistsReinitializedWarning": {
"message": "Il semblerait qu'à cause d'un problème, tous les filtres aient été supprimés et que nous n'ayons été en mesure de rétablir une sauvegarde. C'est pourquoi nous avons été contraints de réinitialiser vos filtres et les paramètres des publicités acceptables. Veuillez vérifier vos listes de filtres et les paramètres de publicités acceptables dans les <a>options d'Adblock Plus</a>."
diff --git a/skin/firstRun.css b/skin/firstRun.css
index 5260d4a..a3c57d8 100644
--- a/skin/firstRun.css
+++ b/skin/firstRun.css
@@ -334,12 +334,12 @@ section > p
}
#share-general,
-:root[lang^="zh-"] #share-chinese
+#share-chinese:lang(zh)
{
display: block;
}
-:root[lang^="zh-"] #share-general,
+#share-general:lang(zh),
#share-chinese
{
display: none;
@@ -478,6 +478,19 @@ section > p
transition-duration: 0.15s;
}
+/* Change order of the blocks for French */
+#content:lang(fr)
+{
+ display: table;
+ margin: auto;
+ caption-side: bottom;
+}
+
+#share:lang(fr)
+{
+ display: table-caption;
+}
+
.toggle
{
cursor: pointer;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list