Commit ff2434ce authored by Manvel Saroyan's avatar Manvel Saroyan

Issue 5538 - updated HTML, strings and functionality of Help tab

parent 572d7d5d
......@@ -335,33 +335,41 @@
"description": "Label below raw view of user's filter list in Advanced tab",
"message": "Save"
},
"options_faq_title": {
"description": "FAQ section name in Help tab and link label in same section",
"message": "Frequently asked questions"
"options_help_description": {
"description": "Help tab description",
"message": "Find help or get in touch with us"
},
"options_faq_description": {
"description": "FAQ section description in Help tab",
"message": "You only need to refresh your filter list in \"Advanced\" very often, but there are also other known problems."
"options_support_title": {
"description": "Section title in Help tab",
"message": "Support"
},
"options_forum_title": {
"description": "Forum section name in Help tab",
"message": "Forum"
"options_report_issue": {
"description": "'Support' section list item in Help tab",
"message": "Think content or functionality is being incorrectly blocked by us? <a>Report incorrectly blocked items here</a>"
},
"options_forum_description": {
"description": "Forum section description in Help tab",
"message": "If the frequently asked questions helped you can reach us in our forum."
"options_report_ad": {
"description": "'Support' section list item in Help tab",
"message": "See an ad that you think shouldn't be there? <a>Report an ad</a>"
},
"options_forum_link": {
"description": "Forum section link in Help tab",
"message": "Adblock Plus support forum"
"options_report_bug": {
"description": "'Support' section list item in Help tab",
"message": "Found a bug? <a>Send us a bug report</a>"
},
"options_media_title": {
"description": "Social media Section name in Help tab",
"message": "Social media"
"options_report_forum": {
"description": "'Support' section list item in Help tab",
"message": "Want support from our community? <a>Go to the Forum</a>"
},
"options_media_description": {
"description": "Social media section description in Help tab",
"message": "If there are major problems with Adblock Plus which affects all of our users, we tell you in our social media channels."
"options_social_title": {
"description": "'Section' title in Help tab",
"message": "Get in touch"
},
"options_social_description": {
"description": "'Get in touch' section description in Help tab",
"message": "Have a question or a new idea? We're here to help."
},
"options_email": {
"description": "Email label in Help tab",
"message": "Email:"
},
"options_dialog_predefined_confirm": {
"description": "Confirming to add a predefined subscription when asked in a dialog",
......
......@@ -296,30 +296,38 @@
<!-- Help tab content -->
<div id="content-help" role="tabpanel" aria-labelledby="tab-help">
<h1 class="i18n_options_faq_title"></h1>
<p class="i18n_options_faq_description"></p>
<p>
<a id="link-faq" class="i18n_options_faq_title" target="_blank"></a>
</p>
<h1 class="i18n_options_forum_title"></h1>
<p class="i18n_options_forum_description"></p>
<p>
<a id="link-forum" class="i18n_options_forum_link" target="_blank"></a>
</p>
<h1 class="i18n_options_media_title"></h1>
<p class="i18n_options_media_description"></p>
<h1 class="i18n_options_tab_help"></h1>
<p class="i18n_options_help_description"></p>
<section>
<h2 class="i18n_options_support_title"></h2>
<ul>
<li id="report-issue" class="i18n_options_report_issue"></li>
<li id="report-ad" class="i18n_options_report_ad"></li>
<li id="report-bug" class="i18n_options_report_bug"></li>
<li id="report-forum" class="i18n_options_report_forum"></li>
</ul>
</section>
<section>
<h2 class="i18n_options_social_title"></h2>
<p class="i18n_options_social_description"></p>
<div id="social">
<ul id="social-general">
<li><a id="twitter">Twitter</a></li>
<li><a id="facebook">Facebook</a></li>
<li><a id="google-plus">Google Plus</a></li>
</ul>
<ul id="social-chinese">
<li><a id="weibo">Weibo</a></li>
</ul>
<p>
<span id="share-general">
<a id="link-twitter" target="_blank">Twitter</a>
<a id="link-facebook" target="_blank">Facebook</a>
<a id="link-gplus" target="_blank">Google+</a>
</span>
<span id="share-chinese">
<a id="link-renren" target="_blank">renren</a>
<a id="link-weibo" target="_blank">weibo</a>
</span>
<strong>
<span class="i18n_options_email"></span>
<a href="mailto:support@adblockplus.org">support@adblockplus.org</a>
</strong>
</p>
</div>
</section>
</div>
</div>
</div>
......
......@@ -530,9 +530,6 @@
{
getDocLink(id, (link) =>
{
if (id == "share-general")
openSharePopup(link);
else
location.href = link;
});
}
......@@ -891,52 +888,37 @@
getMessage("options_customFilters_edit_placeholder", ["/ads/track/*"]));
// Help tab
getDocLink("faq", (link) =>
getDocLink("adblock_plus_report_issue", (link) =>
{
E("link-faq").setAttribute("href", link);
setLinks("report-issue", link);
});
getDocLink("social_twitter", (link) =>
getDocLink("adblock_plus_report_ad", (link) =>
{
E("link-twitter").setAttribute("href", link);
setLinks("report-ad", link);
});
getDocLink("social_facebook", (link) =>
getDocLink("adblock_plus_report_bug", (link) =>
{
E("link-facebook").setAttribute("href", link);
setLinks("report-bug", link);
});
getDocLink("social_gplus", (link) =>
getDocLink("reporter_other_link", (link) =>
{
E("link-gplus").setAttribute("href", link);
setLinks("report-forum", link);
});
getDocLink("social_renren", (link) =>
getDocLink("social_twitter", (link) =>
{
E("link-renren").setAttribute("href", link);
E("twitter").setAttribute("href", link);
});
getDocLink("social_weibo", (link) =>
getDocLink("social_facebook", (link) =>
{
E("link-weibo").setAttribute("href", link);
E("facebook").setAttribute("href", link);
});
// Set forum link
ext.backgroundPage.sendMessage({
type: "app.get",
what: "platform"
},
(platform) =>
{
ext.backgroundPage.sendMessage({
type: "app.get",
what: "application"
},
(application) =>
{
if (platform == "chromium" && application != "opera")
application = "chrome";
getDocLink(application + "_support", (link) =>
getDocLink("social_gplus", (link) =>
{
E("link-forum").setAttribute("href", link);
});
E("google-plus").setAttribute("href", link);
});
getDocLink("social_weibo", (link) =>
{
E("weibo").setAttribute("href", link);
});
E("dialog").addEventListener("keydown", function(e)
......
......@@ -425,7 +425,6 @@ button[role="checkbox"][disabled]
button[role="checkbox"],
#dialog-body .table button[role="checkbox"],
.table button.delete,
#content-help a::before,
#dialog-close::before,
#all-filter-lists-table .arrow,
.context-menu .content a::before
......@@ -466,7 +465,7 @@ button[role="checkbox"],
width: 12px;
}
#content-help a::before
#dialog-body button::before
{
background-position: 0px -42px;
content: "";
......@@ -898,37 +897,54 @@ div[role="tooltip"] .notes p
Help tab content
*/
#content-help
html:not([lang="zh"]) #social-chinese,
html[lang="zh"] #social-general
{
counter-reset: section;
display: none;
}
#content-help h1::before
#social ul
{
counter-increment: section;
content: counter(section) ". ";
list-style: none;
}
#content-help a
#social ul li
{
color: #3A7BA6;
display: inline-block;
text-decoration: none;
-moz-margin-end: 16px;
-webkit-margin-end: 16px;
vertical-align: top;
}
#content-help a::before
#social ul li a
{
-moz-margin-end: 6px;
-webkit-margin-end: 6px;
display: block;
text-align: center;
}
#share-general:lang(zh),
#share-chinese:not(zh)
#social ul li a::before
{
display: none;
display: block;
margin: 0em auto;
width: 2.5rem;
height: 2.5rem;
content: "";
background-color: #099DD1;
}
#twitter::before
{
-webkit-mask: url("social/twitter.svg");
mask: url("social/twitter.svg");
}
#facebook::before
{
-webkit-mask: url("social/facebook.svg");
mask: url("social/facebook.svg");
}
#google-plus::before
{
-webkit-mask: url("social/googleplus.svg");
mask: url("social/googleplus.svg");
}
/*
......
<svg id="97ba3366-fb1c-48cb-8c6e-6639deed46c5" data-name="artwork" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><title>facebook</title><path d="M20.87,18.32v2h-2v3.24h2V33.3h3.21V23.52h3.23l.51-3.24H24.08V18.66c0-.85.28-1.65,1.49-1.65H28V13.77H24.56C21.66,13.77,20.87,15.68,20.87,18.32Z"/><path d="M24,0A24,24,0,1,0,48,24,24,24,0,0,0,24,0Zm0,46A22,22,0,1,1,46,24,22,22,0,0,1,24,46Z"/></svg>
\ No newline at end of file
<svg id="91d921ad-bb62-4b5a-8375-bde640796dbb" data-name="artwork" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><title>googleplus</title><path d="M24,0A24,24,0,1,0,48,24,24,24,0,0,0,24,0Zm0,46A22,22,0,1,1,46,24,22,22,0,0,1,24,46Z"/><path d="M19.45,25.25H24.8a5.49,5.49,0,1,1-5.35-6.74,5.45,5.45,0,0,1,3.35,1.14l1.52-2A8,8,0,1,0,27.43,24V22.75h-8Z"/><polygon points="34.36 20.58 31.87 20.58 31.87 22.75 29.7 22.75 29.7 25.25 31.87 25.25 31.87 27.42 34.36 27.42 34.36 25.25 36.54 25.25 36.54 22.75 34.36 22.75 34.36 20.58"/></svg>
\ No newline at end of file
<svg id="a7caaf2e-2f96-406a-9bd7-f6c50d32e240" data-name="artwork" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><title>twitter</title><path d="M24,0A24,24,0,1,0,48,24,24,24,0,0,0,24,0Zm0,46A22,22,0,1,1,46,24,22,22,0,0,1,24,46Z"/><path d="M32.14,16.6a5.57,5.57,0,0,1-2.25.86h0a3.47,3.47,0,0,0-2.6-1.2,3.75,3.75,0,0,0-3.6,3.88,4.11,4.11,0,0,0,.09.86h0a10.13,10.13,0,0,1-7.63-4,4.06,4.06,0,0,0,1.09,5.12,2.19,2.19,0,0,1-1.57-.44,3.71,3.71,0,0,0,2.78,3.79,2.63,2.63,0,0,1-1.5.12,3.47,3.47,0,0,0,3.22,2.63,5.65,5.65,0,0,1-5,1.61,10.24,10.24,0,0,0,5.63,1.72c5.81,0,10.32-5.07,10.08-11.32v0s0,0,0,0,0,0,0-.06a6.49,6.49,0,0,0,1.75-2,6,6,0,0,1-2,.61A4.09,4.09,0,0,0,32.14,16.6Z"/></svg>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment