chrome/browser/resources/ssl/blocking.html - Issue 23965003: New SSL blocking screen

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

Issue 23965003: New SSL blocking screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Switched to showing the SPKI hashes Created 7 years, 3 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/ssl/blocking.css ('K') | « chrome/browser/resources/ssl/blocking.css ('k') | chrome/browser/resources/ssl/blocking.js » ('j') | chrome/browser/resources/ssl/blocking.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <!DOCTYPE html>

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

	3 <head>

	4 <meta name="viewport" content="width=device-width, initial-scale=1.0,

	5 maximum-scale=1.0, user-scalable=no">

	6 <title i18n-content="title"></title>

	7 <link rel="stylesheet" href="../../../renderer/resources/neterror.css">

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

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

	10 <script src="../../../renderer/resources/neterror.js"></script>

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

	12 </head>

	13 <body id="t">
	Patrick Dubroy 2013/09/12 13:12:26 Since this looks almost identical to neterror.html Since this looks almost identical to neterror.html, can we use the same layout for both? felt 2013/09/16 00:05:21 They differ several ways: - This version needs di Show quoted text On 2013/09/12 13:12:26, dubroy wrote: > Since this looks almost identical to neterror.html, can we use the same layout > for both? They differ several ways: - This version needs different JavaScript, since it supports additional functionality (like communicating back to the parent interstitial). - Although the outermost elements are the same, it has different internals structure because this version has substantially more text. - It also needs custom CSS because this version has larger margins. I could potentially share some of the layout with hidden elements and then apply different CSS style sheets to them, but I think it would end up fairly complex. However, I've done my best to reuse CSS and JS as much as possible in this refactor. Patrick Dubroy 2013/09/18 15:01:35 Did someone on the UX team specifically say they s Show quoted text On 2013/09/16 00:05:21, felt wrote: > On 2013/09/12 13:12:26, dubroy wrote: > > Since this looks almost identical to neterror.html, can we use the same layout > > for both? > > They differ several ways: > > - This version needs different JavaScript, since it supports additional > functionality (like communicating back to the parent interstitial). > - Although the outermost elements are the same, it has different internals > structure because this version has substantially more text. > - It also needs custom CSS because this version has larger margins. Did someone on the UX team specifically say they should have different margins? That seems odd to me. I would think they should be consistent. Show quoted text > I could potentially share some of the layout with hidden elements and then apply > different CSS style sheets to them, but I think it would end up fairly complex. > > However, I've done my best to reuse CSS and JS as much as possible in this > refactor. felt 2013/10/18 05:53:12 Yes. First, this warning has a larger icon (which Show quoted text On 2013/09/18 15:01:35, Patrick Dubroy wrote: > On 2013/09/16 00:05:21, felt wrote: > > On 2013/09/12 13:12:26, dubroy wrote: > > > Since this looks almost identical to neterror.html, can we use the same > layout > > > for both? > > > > They differ several ways: > > > > - This version needs different JavaScript, since it supports additional > > functionality (like communicating back to the parent interstitial). > > - Although the outermost elements are the same, it has different internals > > structure because this version has substantially more text. > > - It also needs custom CSS because this version has larger margins. > > Did someone on the UX team specifically say they should have different margins? > That seems odd to me. I would think they should be consistent. Yes. First, this warning has a larger icon (which calls for more padding around it). Second, this warning has substantially more text (2 paragraphs in one spot instead of 1 sentence fragment; 4-5 paragraphs below the fold instead of 0 text or 2 unimportant sentences). The increased amount of text calls for larger margins to make it more readable. It looks squashed without the extra padding. Show quoted text > > > I could potentially share some of the layout with hidden elements and then > apply > > different CSS style sheets to them, but I think it would end up fairly > complex. > > > > However, I've done my best to reuse CSS and JS as much as possible in this > > refactor. >
	14 <div id="main-frame-error">

	15 <div id="box">

	16 <div id="content-top">

	17 <h1>

	18 <div>

	19 <img class="icon" id="icon-lock">

	20 </div>

	21 <span i18n-content="headline"></span>

	22 </h1>

	23 <!-- Outer and inner divs are needed both for margins and sizing. -->

	24 <div class="outer-text">

	25 <div class="inner-text">

	26 <div class="explanation-par">
	Patrick Dubroy 2013/09/12 13:12:26 Is there a reason you can't have a single element Is there a reason you can't have a single element here, and just embed the <p> tags into the resource itself? felt 2013/09/16 00:05:21 Done. Show quoted text On 2013/09/12 13:12:26, dubroy wrote: > Is there a reason you can't have a single element here, and just embed the <p> > tags into the resource itself? Done.
	27 <span i18n-content="firstPar"></span>

	28 </div>

	29 <div class="explanation-par">

	30 <span i18n-values=".innerHTML:secondPar"></span>

	31 </div>

	32 <div class="explanation-par">

	33 <span i18n-content="thirdPar"></span>

	34 </div>

	35 </div>

	36 </div>

	37 <button id="reload-button" i18n-content="reloadMsg"></button>

	38 <button id="more-less-button" i18n-content="more"></button>

	39 </div>

	40 <!-- Outer and inner divs are needed both for margins and sizing. -->

	41 <div id="help-box-outer" class="hidden">

	42 <div id="help-box-inner">

	43 <div class="ssl-help-box-inner">

	44 <h2><span i18n-content="moreTitle"></span></h2>

	45 <p i18n-content="moreContentFirst"></p>

	46 <p i18n-content="moreContentSecond"></p>

	47 </div>

	48 <div class="ssl-help-box-inner">

	49 <h2><span i18n-content="techTitle"></span></h2>

	50 <p i18n-content="failure"></p>

	51 <span i18n-content="errorType"></span><br>

	52 <span i18n-content="subject"></span><br>

	53 <span i18n-content="issuer"></span><br>

	54 <span i18n-content="fingerprint"></span>

	55 </div>

	56 </div>

	57 </div>

	58 </div>

	59 </div>

	60 </body>

	61 </html>

OLD	NEW