chrome/browser/resources/safe_browsing_malware_block_v2.html - Issue 10855260: Safe Browsing malware interstitial redesign field trial.

Side by Side Diff: chrome/browser/resources/safe_browsing_malware_block_v2.html

Issue 10855260: Safe Browsing malware interstitial redesign field trial. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: changes for review comment #8 Created 8 years, 4 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

OLD	NEW
(Empty)
	1 <html id="template_root" jsvalues="dir:textdirection">
	Dan Beam 2012/08/21 21:54:15 where is the <!DOCTYPE>? where is the <!DOCTYPE>? csilv 2012/08/21 21:59:40 This file does not comply with current webui style This file does not comply with current webui style guidelines: http://dev.chromium.org/developers/web-development-style-guide There are too many style issues to mention, so please take a look at the guidelines so we can clean this up. I would like to ask that we split this into three files (.html, .css, .js) and put into a new subdirectory titled 'safe_browsing'. mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > where is the <!DOCTYPE>? Done. mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:59:40, csilv wrote: > This file does not comply with current webui style guidelines: > http://dev.chromium.org/developers/web-development-style-guide > > There are too many style issues to mention, so please take a look at the > guidelines so we can clean this up. I would like to ask that we split this into > three files (.html, .css, .js) and put into a new subdirectory titled > 'safe_browsing'. Done.
	2 <head>

	3 <title jscontent="title"></title>

	4 <style>
	Dan Beam 2012/08/21 21:54:15 this should be a separate CSS file this should be a separate CSS file mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > this should be a separate CSS file Done.
	5 body {

	6 background-color:#8C0000;

	7 background-image: url("safe_browsing/images/stripe.png");

	8 font-family:Arial,Helvetica,sans-serif;

	9 margin:0px;

	10 }

	11 .cell {

	12 padding:40px;

	13 }

	14 .box {

	15 width:700px;
	Dan Beam 2012/08/21 21:54:15 none of this CSS adheres to the style guide, move none of this CSS adheres to the style guide, move to .css file and the presubmit will help you through this. mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > none of this CSS adheres to the style guide, move to .css file and the presubmit > will help you through this. Done.
	16 background-color:white;

	17 color:black;

	18 font-size:10pt;

	19 line-height:16pt;

	20 text-align:left;

	21 padding:20px;

	22 position:relative;

	23 -webkit-box-shadow:3px 3px 8px #200;

	24 -webkit-border-radius:5px;

	25 }

	26 html[dir='rtl'] .box {

	27 text-align:right;
	Dan Beam 2012/08/21 21:54:15 use text-align: start; in the non-RTL version and use text-align: start; in the non-RTL version and it'll work for both. mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > use text-align: start; in the non-RTL version and it'll work for both. Done.
	28 }

	29 .right {
	Dan Beam 2012/08/21 21:54:15 you should use start/end and styles that work with you should use start/end and styles that work with RTL preferably mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > you should use start/end and styles that work with RTL preferably Done.
	30 float:right;

	31 }

	32 .logo {

	33 max-height:54px;

	34 padding:15px;

	35 }

	36 .title {

	37 margin:0px 90px 0px 20px;

	38 font-size:14pt;

	39 margin-bottom:6pt;

	40 font-weight:bold;

	41 color:#333333;

	42 }

	43 .main {

	44 margin:5px 210px 10px 20px;

	45 color:#4B4B4D;

	46 font-size:14px;

	47 }

	48 .dropdown {

	49 margin: 0px 40px 0px 20px;

	50 color:#4B4B4D;

	51 font-size:12px;

	52 }

	53 .footer {

	54 margin: 0px 20px 0px 15px;

	55 color:#4B4B4D;

	56 font-size:12px;

	57 }

	58 .learnmorelink {

	59 font-size:12px;

	60 }

	61 .submission {

	62 margin:15px 5px 15px 0px;

	63 padding:0px;

	64 }

	65 input {

	66 margin:0px;

	67 }

	68 .checkboxtext {

	69 font-size:12px;

	70 color:#4B4B4D;

	71 }

	72 .blue {

	73 background: -webkit-linear-gradient(#709AF1, #6C94F0 44%, #5F84EE);

	74 border: 1px solid #3574CB;

	75 border-bottom: 1px solid #3574CB;

	76 border-radius: 3px;

	77 -webkit-box-shadow: inset 0 1px 0 0 #81A9F3, 0px 1px 2px rgba(0,0,0,0.2);

	78 color: #fff;

	79 font-family: arial, helvetica, sans-serif;

	80 font-size: 14px;

	81 font-weight: bold;

	82 line-height: 1;

	83 padding: 11px 38px 10px 38px;

	84 text-align: center;

	85 text-shadow: 0 -1px 0 #4865e4;

	86 cursor: pointer;

	87 text-decoration: none;

	88 display: inline-block;

	89 }

	90 .blue:hover, .blue:focus {

	91 background: -webkit-linear-gradient(#A5BCF5, #6C94F0 70%, #5F84EE);

	92 border: 1px solid #3574CB;

	93 border-bottom: 1px solid #3574CB;

	94 -webkit-box-shadow: inset 0 1px 0 0 #81A9F3, 0px 1px 2px rgba(0,0,0,0.3);;

	95 }

	96 .blue:active {

	97 background: -webkit-linear-gradient(#709AF1, #6C94F0 44%, #5F84EE);

	98 border: 1px solid #3574CB;

	99 border-top:1px solid #3574CB;

	100 border-bottom:1px solid #3574CB;

	101 -webkit-box-shadow: inset 1px 1px 1px 1px rgba(0, 0, 0, 0.1);

	102 }

	103 .blue:focus {

	104 border: 1px solid #000;

	105 }

	106 .hr {

	107 margin: 0px 20px 0px 20px;

	108 }

	109 a {

	110 color: #1154CC;

	111 }

	112 a:link {

	113 text-decoration: none;

	114 }

	115 a:visited {

	116 text-decoration: none;

	117 }

	118 a:hover {

	119 text-decoration: underline;

	120 }

	121 a:active {

	122 text-decoration: underline;

	123 }

	124 .checkbox {

	125 position: relative;

	126 margin: 0px 80px 0px 5px

	127 }

	128 .checkbox input {

	129 margin-top: 5px;

	130 margin-left: 1px;

	131 position: absolute;

	132 }

	133 .checkbox span {

	134 -webkit-margin-start: 21px;

	135 display: inline-block;

	136 }

	137 </style>

	138

	139 <script>
	Dan Beam 2012/08/21 21:54:15 this should be a separate .js file this should be a separate .js file mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > this should be a separate .js file Done.
	140 function sendCommand(cmd) {

	141 window.domAutomationController.setAutomationId(1);

	142 window.domAutomationController.send(cmd);

	143 }

	144

	145 function savePreference() {

	146 var checkBox = document.getElementById('checkreport');

	147 if (checkBox.checked) {

	148 sendCommand('doReport');

	149 } else {

	150 sendCommand('dontReport');

	151 }

	152 }

	153

	154 function seeMore() {

	155 if (document.getElementById('see_less_text').style.display == 'none') {
	Dan Beam 2012/08/21 21:54:15 this should use $() from src/chrome/browser/resour this should use $() from src/chrome/browser/resources/shared/util.js and should be using .hidden instead of .style.display mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > this should use $() from src/chrome/browser/resources/shared/util.js and should > be using .hidden instead of .style.display Done.
	156 document.getElementById('see_more_text').style.display = 'none';

	157 document.getElementById('see_less_text').style.display = 'inline';

	158 document.getElementById('see_more_contents').style.display = 'block';

	159 sendCommand('expandedSeeMore');

	160 } else {

	161 document.getElementById('see_more_text').style.display = 'inline';

	162 document.getElementById('see_less_text').style.display = 'none';

	163 document.getElementById('see_more_contents').style.display = 'none';

	164 }

	165 }

	166 </script>

	167 </head>

	168 <body oncontextmenu="return false;">
	Dan Beam 2012/08/21 21:54:15 no inline handlers, make these in the JS instead. no inline handlers, make these in the JS instead. mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > no inline handlers, make these in the JS instead. Done.
	169

	170 <table width="100%" cellspacing="0" cellpadding="0">

	171 <td class="cell" valign="middle" align="center">

	172 <div class="box">

	173 <div><img src="../../app/theme/%DISTRIBUTION%/product_logo_name_108.png" c lass="logo"></div>
	Dan Beam 2012/08/21 21:54:15 all lines should be less than 80 columns all lines should be less than 80 columns mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > all lines should be less than 80 columns Done.
	174

	175 <div class="title" i18n-content="headLine"></div>

	176 <div class="right"><img src="safe_browsing/images/malware_icon_v2.jpg"

	177 width=200 height=200 alt="Malware Icon" /></div>

	178 <div class="main" i18n-values=".innerHTML:description1"></div>

	179 <div class="main" i18n-content="description2"></div>

	180 <div class="main">

	181 <span i18n-content="description3"></span>

	182 <a class="learnmorelink" href="" i18n-content="learnMore"

	183 onclick="sendCommand('learnMore2'); return false;"
	Dan Beam 2012/08/21 21:54:15 4 \s indent 4 \s indent mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > 4 \s indent Done.
	184 onmousedown="return false;"></a>

	185 </div>

	186

	187 <div class="main">

	188 <form class="submission">

	189 <button id="back" class="blue" i18n-content="back_button"

	190 onclick="sendCommand('takeMeBack')"></button>

	191 <br>

	192 </form>

	193 </div>

	194

	195 <div style="clear: both;"></div>
	Dan Beam 2012/08/21 21:54:15 all styles should be in the CSS all styles should be in the CSS mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > all styles should be in the CSS Done.
	196

	197 <div id="see_more_contents" style="display: none">

	198 <div class="dropdown" i18n-values=".innerHTML:description4"></div>

	199 <div class="dropdown">

	200 <a href="" i18n-content="details" jsdisplay="displayShowDiagnostic"

	201 onclick="sendCommand('showDiagnostic'); return false;"

	202 onmousedown="return false;"></a>

	203 </div>

	204 </div>

	205

	206 <hr class="hr">
	Dan Beam 2012/08/21 21:54:15 hr.hr makes little to no sense to me hr.hr makes little to no sense to me mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > hr.hr makes little to no sense to me Done.
	207 <div class="footer">

	208 <a class="right" href="" onclick="seeMore(); return false;"
	Dan Beam 2012/08/21 21:54:15 use preventDefault() instead of return false; and use preventDefault() instead of return false; and make href="#" and call preventDefaultForPoundLinkClicks() in src/chrome/browser/resources/shared/util.js mattm 2012/08/22 02:10:48 Done. Show quoted text On 2012/08/21 21:54:15, Dan Beam wrote: > use preventDefault() instead of return false; and make href="#" and call > preventDefaultForPoundLinkClicks() in > src/chrome/browser/resources/shared/util.js Done.
	209 onmousedown="return false;">

	210 <span id="see_more_text" i18n-content="seeMore"></span>

	211 <span id="see_less_text" i18n-content="seeLess" style="display: none"> </span>

	212 </a>

	213 <div class="checkbox" jsdisplay="displaycheckbox">

	214 <label for="checkreport">

	215 <input id="checkreport" name="checked" type="checkbox"

	216 jsvalues=".checked:boxchecked" onclick="savePreference()">

	217 <span class="checkboxtext" i18n-values=".innerHTML:confirm_text"></s pan>

	218 </label>

	219 </div>

	220 </div>

	221 </div>

	222 </td>

	223 </table>

	224 </body>

	225 </html>

OLD	NEW

« no previous file with comments | « chrome/browser/chrome_browser_field_trials.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page.h » ('j') | no next file with comments »