chrome/browser/resources/ssl/interstitial_v2.html - Issue 319193002: Update the malware interstitial to have the new layout

Side by Side Diff: chrome/browser/resources/ssl/interstitial_v2.html

Issue 319193002: Update the malware interstitial to have the new layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Pre-review style fixes Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« chrome/browser/resources/safe_browsing/safe_browsing_v3.js ('K') | « chrome/browser/resources/ssl/interstitial_v2.css ('k') | chrome/browser/resources/ssl/interstitial_v2.js » ('j') | chrome/browser/resources/ssl/interstitial_v2.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html i18n-values="dir:textDirection">	2 <html i18n-values="dir:textDirection">

3 <head>	3 <head>

4 <meta charset="utf-8">	4 <meta charset="utf-8">

5 <meta name="viewport"	5 <meta name="viewport"

6 content="initial-scale=1, minimum-scale=1, width=device-width">	6 content="initial-scale=1, minimum-scale=1, width=device-width">

7 <title i18n-content="tabTitle"></title>	7 <title i18n-content="tabTitle"></title>

8 <link rel="stylesheet" href="interstitial_v2.css">	8 <link rel="stylesheet" href="interstitial_v2.css">

9 <script src="../../../../ui/webui/resources/js/util.js"></script>	9 <script src="../../../../ui/webui/resources/js/util.js"></script>

10 <script src="../../../../ui/webui/resources/js/load_time_data.js"></script>	10 <script src="../../../../ui/webui/resources/js/load_time_data.js"></script>

11 <script src="ssl_errors_common.js"></script>	11 <script src="ssl_errors_common.js"></script>

	12 <script src="../safe_browsing/safe_browsing_v3.js"></script>
	Bernhard Bauer 2014/06/09 10:04:03 The versioning is getting a bit confusing here. Wh The versioning is getting a bit confusing here. Why do have v3 JS in the v2 HTML? felt 2014/06/09 14:24:09 Yeah, I have some regrets. I started off with V2 b Show quoted text On 2014/06/09 10:04:03, Bernhard Bauer wrote: > The versioning is getting a bit confusing here. Why do have v3 JS in the v2 > HTML? Yeah, I have some regrets. I started off with V2 because it is the second version of the SSL warning. However... there was already a malware warning redesign, so there is already a malware warning V2. So this is V2 for SSL and V3 for malware. :/ Bernhard Bauer 2014/06/09 14:45:41 Hrm, ok. Can you at least triple-pinky-promise me Show quoted text On 2014/06/09 14:24:09, felt wrote: > On 2014/06/09 10:04:03, Bernhard Bauer wrote: > > The versioning is getting a bit confusing here. Why do have v3 JS in the v2 > > HTML? > > Yeah, I have some regrets. I started off with V2 because it is the second > version of the SSL warning. However... there was already a malware warning > redesign, so there is already a malware warning V2. So this is V2 for SSL and V3 > for malware. :/ Hrm, ok. Can you at least triple-pinky-promise me that you'll clean this up eventually to get rid of all the version numbers here? felt 2014/06/09 15:24:02 Triple-pinky-promised. I want to move all of the n Show quoted text On 2014/06/09 14:45:41, Bernhard Bauer wrote: > On 2014/06/09 14:24:09, felt wrote: > > On 2014/06/09 10:04:03, Bernhard Bauer wrote: > > > The versioning is getting a bit confusing here. Why do have v3 JS in the v2 > > > HTML? > > > > Yeah, I have some regrets. I started off with V2 because it is the second > > version of the SSL warning. However... there was already a malware warning > > redesign, so there is already a malware warning V2. So this is V2 for SSL and > V3 > > for malware. :/ > > Hrm, ok. Can you at least triple-pinky-promise me that you'll clean this up > eventually to get rid of all the version numbers here? Triple-pinky-promised. I want to move all of the new code into a new /security_interstitial/ folder once the old versions are deprecated, which will let me get rid of all the old code and version numbers entirely.
12 <script src="interstitial_v2.js"></script>	13 <script src="interstitial_v2.js"></script>

13 </head>	14 </head>

14 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">	15 <body id="body"

	16 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">

15 <div class="interstitial-wrapper">	17 <div class="interstitial-wrapper">

16 <div class="icon"></div>	18 <div class="icon" id="icon"></div>

17 <div id="main-message">	19 <div id="main-message">

18 <h1 i18n-content="heading"></h1>	20 <h1 i18n-content="heading"></h1>

19 <p i18n-values=".innerHTML:primaryParagraph"></p>	21 <p i18n-values=".innerHTML:primaryParagraph"></p>

	22 <p id="second-paragraph" class="hidden"></p>

	23 <p id="third-paragraph" class="hidden"></p>

20 </div>	24 </div>

21 <div class="nav-wrapper">	25 <div class="nav-wrapper">

22 <button i18n-content="primaryButtonText" id="primary-button"></button>	26 <button i18n-content="primaryButtonText" id="primary-button"></button>

23 <a href="#" id="details-button" i18n-content="openDetails"></a>	27 <a href="#" id="details-button" i18n-content="openDetails"></a>

24 </div>	28 </div>

25 <div id="details" class="hidden">	29 <div id="details" class="hidden">

26 <p i18n-values=".innerHTML:explanationParagraph"></p>	30 <p id="explanation-paragraph" class="hidden"></p>

27 <p i18n-values=".innerHTML:finalParagraph"></p>	31 <p id="final-paragraph" class="hidden"></p>

28 </div>	32 </div>

29 </div>	33 </div>

30 </body>	34 </body>

31 </html>	35 </html>

OLD	NEW