| Index: firstRun.html |
| =================================================================== |
| --- a/firstRun.html |
| +++ b/firstRun.html |
| @@ -17,83 +17,293 @@ |
| --> |
| <html> |
| <head> |
| <title class="i18n_firstRun_title"></title> |
| <meta charset="utf-8" /> |
| <meta name="viewport" content="width=device-width, initial-scale=1" /> |
| <link type="text/css" href="skin/common.css" rel="stylesheet" /> |
| + <link type="text/css" href="skin/defaults.css" rel="stylesheet" /> |
| <link type="text/css" href="skin/firstRun.css" rel="stylesheet"/> |
| <script type="text/javascript" src="polyfill.js"></script> |
| <script type="text/javascript" src="ext/common.js"></script> |
| <script type="text/javascript" src="ext/content.js"></script> |
| <script type="text/javascript" src="common.js"></script> |
| <script type="text/javascript" src="i18n.js"></script> |
| <script type="text/javascript" src="firstRun.js"></script> |
| </head> |
| + |
| <body> |
| - |
| - |
| - <header> |
| - <img id="logo"> |
| - <h1 id="title-main" class="i18n_firstRun_title"></h1> |
| - </header> |
| - |
| - <section id="filterlistsReinitializedWarning" class="i18n_firstRun_filterlistsReinitializedWarning warning" hidden="true"></section> |
| - |
| - <div id="content"> |
| - <section id="general"> |
| - <div id="acceptable-ads-block" class="block"> |
| - <h2 class="i18n_firstRun_acceptableAdsHeadline"></h2> |
| - <p id="acceptable-ads-explanation" class="i18n_firstRun_acceptableAdsExplanation"></p> |
| - </div> |
| - <div id="abb-promotion-block" class="block"> |
| - <h2 class="i18n_firstRun_abbPromotionHeadline"></h2> |
| - <a href="https://adblockbrowser.org/?ref=frp"> |
| - <div> |
| - <img src="skin/abb-logo.png" alt="Adblock Browser logo" /> |
| - </div> |
| - <div> |
| - <div class="i18n_firstRun_abbButtonTitle title"></div> |
| - <div class="i18n_firstRun_abbButtonSubtitle subtitle"></div> |
| - </div> |
| - </a> |
| - </div> |
| - </section> |
| - |
| - |
| - <section id="share"> |
| - <h2 id="share-headline" class="i18n_firstRun_share_headline"></h2> |
| + |
| + <nav id="navbar"> |
| + <div class="navbar-container"> |
| + <a href="https://adblockplus.org/en/" hreflang="en" id="navbar-logo"> |
| + <img src="skin/img/navbar-logo.png" srcset="skin/img/navbar-logo.svg 2x"> |
|
Thomas Greiner
2017/10/23 13:17:42
What's the reason for including both PNG as well a
juliandoucette
2017/10/23 13:27:35
He copied and pasted the new abp.org header. It's
martin
2017/10/23 14:43:26
As far as I know SVGs are served on high-dpi displ
Thomas Greiner
2017/10/23 16:45:48
That's indeed a tricky question how much it makes
|
| + <span>Adblock <strong>Plus</strong></span> |
|
Thomas Greiner
2017/10/23 13:17:42
Please make sure that any text we show in the UI i
juliandoucette
2017/10/23 13:27:34
Is it necessary to make text that we do not transl
martin
2017/10/23 14:43:26
I intentionally didn't i18n this because it's more
Thomas Greiner
2017/10/23 16:45:48
You're right. We're not translating "Adblock Plus"
|
| + </a> |
| + <a href="#" id="navbar-menu-toggle"> |
| + <img src="skin/img/menu-toggle.png" srcset="skin/img/menu-toggle.svg 2x"> |
| + </a> |
| + <ul id="navbar-menu"> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/en/about" hreflang="en" class="i18n_firstRun_aboutLink"></a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/en/features" hreflang="en" class="i18n_firstRun_featuresLink"></a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/en/bugs" hreflang="en" class="i18n_firstRun_reportAnIssueLink"></a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/en/contribute" hreflang="en" class="i18n_firstRun_contributeLink"></a> |
| + </li> |
| + |
| + <li id="navbar-locale-menubar"> |
| + <a href="#" id="navbar-locale-selected"> |
| + English (US) |
| + </a> |
| + <ul id="navbar-locale-menu"> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/ar/firefox" hreflang="ar"> |
|
juliandoucette
2017/10/21 16:18:42
These hrefs are not correct. We want to translate
Thomas Greiner
2017/10/23 12:01:55
IIRC I brought this up in a UI meeting that it doe
martin
2017/10/23 14:43:25
What I know for sure is that the spec I'm currentl
Thomas Greiner
2017/10/23 16:45:48
Yep, filing a spec issue should be sufficient.
|
| + العربية (AR) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/bg/firefox" hreflang="bg"> |
| + Български (BG) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/de/firefox" hreflang="de"> |
| + Deutsch (DE) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/en/firefox" hreflang="en"> |
| + English (US) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/es/firefox" hreflang="es"> |
| + Español (España) (LA) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/fr/firefox" hreflang="fr"> |
| + Français (FR) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/he/firefox" hreflang="he"> |
| + עברית (IL) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/hu/firefox" hreflang="hu"> |
| + Magyar (HU) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/ko/firefox" hreflang="ko"> |
| + 한국어 (KR) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/lt/firefox" hreflang="lt"> |
| + Lietuvių (LT) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/nl/firefox" hreflang="nl"> |
| + Nederlands (NL) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/pt_BR/firefox" hreflang="pt_BR"> |
| + Português (Brasil) (BR) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/ru/firefox" hreflang="ru"> |
| + Русский (RU) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/sk/firefox" hreflang="sk"> |
| + Slovenčina (SK) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/zh_CN/firefox" hreflang="zh_CN"> |
| + 中文(简体) (CN) |
| + </a> |
| + </li> |
| + |
| + <li> |
| + <a href="https://adblockplus.org/zh_TW/firefox" hreflang="zh_TW"> |
| + 中文(台灣) (TW) |
| + </a> |
| + </li> |
| + |
| + </ul> |
| + </li> |
| + </ul> |
| + </div> |
| + </nav> |
| - <div class="block"> |
| - <a id="donate" class="i18n_firstRun_donate" target="_blank"></a> |
| - <span id="donate-label" class="i18n_firstRun_donate_label"></span> |
| + <main> |
| + <header id="installation-status-header"> |
| + <img src="skin/icons/first-run/icon-checkmark-header.svg" alt="checkmark icon"> |
| + <h1 class="i18n_firstRun_title"></h1> |
| + <p class="i18n_firstRun_subtitle"></p> |
| + </header> |
| + |
| + <div class="container content"> |
| + |
| + <div id="content-columns-container" class="row"> |
| + |
| + <section class="column one-third ta-centre"> |
| + <header class="section-header"> |
| + <img src="skin/icons/first-run/icon-checkmark.svg" alt="checkmark icon"> |
| + <h2 class="i18n_firstRun_columnOneTitle"></h2> |
| + </header> |
| + <p id="first-column-description" class="i18n_firstRun_columnOneDescription column-description"></p> |
|
Thomas Greiner
2017/10/23 13:17:41
Detail: The order of the columns may change. Gener
martin
2017/10/23 14:43:26
Completely agree. Will fix that.
|
| + <a id="options-trigger" class="i18n_firstRun_configure-button button-primary" href="#"></a> |
| + </section> |
| + |
| + <section class="column one-third ta-centre"> |
| + <header class="section-header"> |
| + <img src="skin/icons/first-run/icon-rocket.svg" alt="rocket icon"> |
| + <h2 class="i18n_firstRun_columnTwoTitle"></h2> |
| + </header> |
| + <p class="i18n_firstRun_columnTwoDescription column-description"></p> |
| + <div class="store-buttons"> |
| + <a href="" class="store-button applestore-button"> |
|
Thomas Greiner
2017/10/23 13:17:42
Don't we have the links for those buttons yet?
martin
2017/10/23 14:43:26
We probably do, however they are not included in t
Thomas Greiner
2017/10/23 16:45:48
Great, thanks.
|
| + <img src="skin/icons/first-run/appstore-bg.svg" alt="apple store button"> |
| + </a> |
| + <a href="" class="store-button googleplay-button"> |
| + <img src="skin/icons/first-run/googleplay-bg.svg" alt="google play store button"> |
| + </a> |
| + </div> |
| + </section> |
| + |
| + <section class="column one-third ta-centre"> |
| + <header class="section-header"> |
| + <img src="skin/icons/first-run/icon-lock.svg" alt="padlock icon"> |
| + <h2 class="i18n_firstRun_columnThreeTitle"></h2> |
| + </header> |
| + <p id="third-column-description" class="i18n_firstRun_columnThreeDescription column-description"></p> |
| + </section> |
| + |
| </div> |
| - |
| - <div class="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> |
| + |
| + </div> |
| + </main> |
| - <!-- 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> |
| - </section> |
| + <footer id="footer" class="content"> |
| + <div class="container"> |
| + <div class="row"> |
| + <nav class="column one-fourth"> |
| + <h5 class="i18n_firstRun_footerResourcesHeader"></h5> |
| + <ul> |
| + |
| + <li><a href="https://adblockplus.org/en/acceptable-ads" class="i18n_firstRun_footerAcceptableAdsLink" hreflang="en"></a></li> |
| + |
| + <li><a href="https://adblockplus.org/en/documentation" class="i18n_firstRun_footerDocumentationLink" hreflang="en"></a></li> |
| + |
| + <li><a href="https://adblockplus.org/en/deployments" class="i18n_firstRun_footerForAdminsLink" hreflang="en"></a></li> |
| + |
| + </ul> |
| + </nav> |
| + <nav class="column one-fourth"> |
| + <h5class="i18n_firstRun_footerCommunityHeader"></h5> |
|
juliandoucette
2017/10/21 16:18:42
Missing space.
martin
2017/10/23 14:43:27
Will fix.
|
| + <ul> |
| + <li><a href="https://adblockplus.org/releases/" class="i18n_firstRun_footerAnnouncementsLink" hreflang="en"></a></li> |
| + <li><a href="https://adblockplus.org/blog/" class="i18n_firstRun_footerBlogLink" hreflang="en"></a></li> |
| + <li><a href="https://adblockplus.org/forum/" class="i18n_firstRun_footerForumLink" hreflang="en"></a></li> |
| + |
| + |
| + <li><a href="https://adblockplus.org/en/development-builds" class="i18n_firstRun_footerDevelopmentBuildsLink" hreflang="en"></a></li> |
|
Thomas Greiner
2017/10/23 13:17:42
Detail: Wrong indentation level and inconsisent sp
martin
2017/10/23 14:43:25
Will fix. Sorry about that.
|
| + |
| + |
| + </ul> |
| + </nav> |
| + <nav class="column one-fourth"> |
| + <h5 class="i18n_firstRun_footerDevelopmentHeader"></h5> |
| + <ul> |
| + |
| + |
| + <li><a href="https://adblockplus.org/en/source" class="i18n_firstRun_footerSourceCodeLink" hreflang="en"></a></li> |
| + |
| + |
| + <li><a href="https://issues.adblockplus.org/report/13" class="i18n_firstRun_footerRoadmapLink" hreflang="en"></a></li> |
| + |
| + |
| + <li><a href="https://adblockplus.org/en/tools" class="i18n_firstRun_footerToolsLink" hreflang="en"></a></li> |
| + |
| + |
| + <li><a href="https://eyeo.com/jobs/" class="i18n_firstRun_footerJobsLink" hreflang="en"></a></li> |
| + </ul> |
| + </nav> |
| + <nav id="social-list" class="column one-fourth"> |
| + <h5 class="i18n_firstRun_footerFollowUsHeader"></h5> |
| + <ul> |
| + <li> |
| + <a href="https://twitter.com/AdblockPlus" target="_blank"> |
| + <img src="skin/img/footer-twitter-glyphicon.png" alt="Twitter"> |
|
Thomas Greiner
2017/10/23 13:17:41
I assume that those icons are were not created by
juliandoucette
2017/10/23 13:27:34
Good question. I'll have to forward it along to pr
|
| + </a> |
| + </li> |
| + <li> |
| + <a href="https://www.youtube.com/user/AdblockPlusOfficial" target="_blank"> |
| + <img src="skin/img/footer-youtube-glyphicon.png"> |
| + </a> |
| + </li> |
| + <li> |
| + <a href="https://www.facebook.com/adblockplus" target="_blank"> |
| + <img src="skin/img/footer-facebook-glyphicon.png"> |
| + </a> |
| + </li> |
| + <li> |
| + <a href="https://www.instagram.com/adblockplus/" target="_blank"> |
| + <img src="skin/img/footer-instagram-glyphicon.png"> |
| + </a> |
| + </li> |
| + </ul> |
| + </nav> |
| + </div> |
| + <div id="footer-legal"> |
| + <p id="copyright-notice" class="i18n_firstRun_footerCopyright"></p> |
| + <ul id="legal-list"> |
| + |
| + <li><a href="https://adblockplus.org/en/terms" class="i18n_firstRun_footerTermsOfUseLink" hreflang="en"></a></li> |
| + |
| + <li><a href="https://adblockplus.org/en/privacy" class="i18n_firstRun_footerPrivacyPolicyLink" hreflang="en"></a></li> |
| + |
| + <li><a href="https://adblockplus.org/en/impressum" class="i18n_firstRun_footerLegalNoticeLink" hreflang="en"></a></li> |
| + |
| + </ul> |
| + </div> |
| + </div> |
| + </footer> |
| - </div> |
| + </body> |
| - <footer> |
| - <a id="contributors" class="i18n_firstRun_contributor_credits"></a> |
| - </footer> |
| - </body> |
| </html> |