Unified Diff: chrome/content/ui/firstRun.html
Issue 10585038:
First-run page (revisited) (Closed)
Patch Set: Implemented behavior of remaining buttons on Chrome; Added changelog and data corruption warning
Created May 24, 2013, 10:09 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« chrome/content/ui/featureSubscriptions.xml ('K')
|
« chrome/content/ui/featureSubscriptions.xml ('k')
|
chrome/content/ui/firstRun.js » ('j')
|
chrome/content/ui/firstRun.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: chrome/content/ui/firstRun.html |
| =================================================================== |
| rename from chrome/content/ui/firstRun.xhtml |
| rename to chrome/content/ui/firstRun.html |
| --- a/chrome/content/ui/firstRun.xhtml |
| +++ b/chrome/content/ui/firstRun.html |
| @@ -1,3 +1,4 @@ |
| +<!DOCTYPE html> |
| <!-- |
| - This file is part of Adblock Plus <http://adblockplus.org/>, |
| - Copyright (C) 2006-2013 Eyeo GmbH |
| @@ -15,38 +16,83 @@ |
| - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| --> |
| -<!DOCTYPE html SYSTEM "chrome://adblockplus/locale/firstRun.dtd"> |
| +<html> |
| + <head> |
| + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> |
| + <link type="text/css" href="/skin/firstRun.css" rel="stylesheet"/> |
| + <script type="text/javascript" src="firstRun.js" charset="utf-8"></script> |
|
Wladimir Palant
2013/05/27 11:02:00
Please don't define the charset of scripts - it's
|
| + </head> |
| + <body> |
| + <div id="shade" class="arrow"></div> |
| + <div id="content"> |
| + <header> |
| + <h1 id="title-main"></h1> |
| + <div id="title-changelog"><a class="i18n_firstRun_changelog"></a></div> |
| + </header> |
| -<html xmlns="http://www.w3.org/1999/xhtml"> |
| - <head> |
| - <title>&dialog.title;</title> |
| - <script type="application/x-javascript;version=1.7" src="utils.js"/> |
| - <script type="application/x-javascript;version=1.7" src="firstRun.js"/> |
| - <link type="text/css" href="chrome://adblockplus/skin/firstRun.css" rel="stylesheet"/> |
| - </head> |
| - <body onload="init()"> |
| - <p>&confirmation;</p> |
| + <p id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning" hidden="true"></p> |
| - <div class="sectionContainer"> |
| - <p class="sectionTitle">&advancedSection;</p> |
| + <p id="acceptableAdsExplanation" class="i18n_firstRun_acceptableAdsExplanation"></p> |
| - <p>&listSelection1;</p> |
| + <h2 id="features-title" class="i18n_firstRun_features"></h2> |
| - <p id="listNameContainer" hidden="true"> |
| - <div id="listName"/> |
| - <a id="listHomepage" onclick="UI.loadInBrowser(this.getAttribute('href')); return false;">&visitHomepage.label;</a> |
| - </p> |
| - <p id="listNone">&noList;</p> |
| + <ul id="features"> |
| + <li id="feature-typo" class="feature"> |
| + <div class="feature-image"></div> |
| + <div class="feature-description"> |
| + <p class="feature-text"> |
| + <span class="i18n_firstRun_feature_typo feature-title"></span> <span class="i18n_firstRun_feature_typo_description"></span> |
| + </p> |
| + </div> |
| + <button id="toggle-typo"></button> |
| + </li> |
| + <li id="feature-malware" class="feature"> |
| + <div class="feature-image"></div> |
| + <div class="feature-description"> |
| + <p class="feature-text"> |
| + <span class="i18n_firstRun_feature_malware feature-title"></span> <span class="i18n_firstRun_feature_malware_description"></span> |
| + </p> |
| + </div> |
| + <button id="toggle-malware"></button> |
| + </li> |
| + <li id="feature-social" class="feature"> |
| + <div class="feature-image"></div> |
| + <div class="feature-description"> |
| + <p class="feature-text"> |
| + <span class="i18n_firstRun_feature_social feature-title"></span> <span class="i18n_firstRun_feature_social_description"></span> |
| + </p> |
| + </div> |
| + <button id="toggle-social"></button> |
| + </li> |
| + <li id="feature-tracking" class="feature"> |
| + <div class="feature-image"></div> |
| + <div class="feature-description"> |
| + <p class="feature-text"> |
| + <span class="i18n_firstRun_feature_tracking feature-title"></span> <span class="i18n_firstRun_feature_tracking_description"></span> |
| + </p> |
| + </div> |
| + <button id="toggle-tracking"></button> |
| + </li> |
| + </ul> |
| - <p id="acceptableAds" hidden="true"> |
| - &acceptableAds2; |
| - <a href="#" onclick="UI.loadInBrowser(Prefs.subscriptions_exceptionsurl); return false;">&viewList.label;</a> |
| - <a href="#" onclick="UI.loadDocLink('acceptable_ads'); return false;">&readMore.label;</a> |
| - </p> |
| + <footer id="social"> |
| + <h1 class="i18n_firstRun_share"></h1> |
| + <ul> |
| + <li> |
| + <a id="share-facebook" class="share-button" href="#" title="Share on Facebook"></a> |
| + </li> |
| + <li> |
| + <a id="share-twitter" class="share-button" href="#" title="Share on Twitter"></a> |
| + </li> |
| + <li> |
| + <a id="share-gplus" class="share-button" href="#" title="Share on Google+"></a> |
| + </li> |
| + </ul> |
| + </footer> |
| </div> |
| - <p id="changeDescription" _textTemplate="&listSelection2;"> |
| - <a href="#" onclick="openFilters(); return false;"/> |
| - </p> |
| + <div id="glass-pane"> |
| + <iframe id="share-popup" scrolling="no"></iframe> |
| + </div> |
| </body> |
| </html> |
