| Index: chrome/browser/resources/safe_browsing_multiple_threat_block.html
|
| diff --git a/chrome/browser/resources/safe_browsing_multiple_threat_block.html b/chrome/browser/resources/safe_browsing_multiple_threat_block.html
|
| index 40dd0c4efea99375a18ca0e2d6962e5deecea868..100b8c12d47b34cbf1de0d7047414e2e19324df5 100644
|
| --- a/chrome/browser/resources/safe_browsing_multiple_threat_block.html
|
| +++ b/chrome/browser/resources/safe_browsing_multiple_threat_block.html
|
| @@ -1,5 +1,5 @@
|
| <!DOCTYPE html>
|
| -<html>
|
| +<html id="template_root">
|
| <head>
|
| <title i18n-content="title"></title>
|
| <style>
|
| @@ -87,53 +87,76 @@ function sendCommand(command) {
|
| window.domAutomationController.send(command);
|
| }
|
|
|
| -function showDiagnostic(errorID) {
|
| - sendCommand("showDiagnostic:" + errorID);
|
| -}
|
| -
|
| -function reportError(errorID) {
|
| - sendCommand("reportError:" + errorID);
|
| -}
|
| -
|
| function learnMore() {
|
| - sendCommand("learnMore");
|
| + sendCommand('learnMore');
|
| }
|
|
|
| function proceed() {
|
| - sendCommand("proceed");
|
| + sendCommand('proceed');
|
| }
|
|
|
| function takeMeBack() {
|
| - sendCommand("takeMeBack");
|
| + sendCommand('takeMeBack');
|
| +}
|
| +
|
| +/**
|
| + * Called when the user clicks the link to show the diagnostic or report a
|
| + * malware site, depending on the threat type.
|
| + * @param {MouseEvent} event The mouse event that triggered this call.
|
| + */
|
| +function showOrReport(event) {
|
| + var id = event.currentTarget.getAttribute('chromiumID');
|
| + var isMalware = event.currentTarget.getAttribute('chromiumIsMalware');
|
| + var cmd = isMalware ? 'showDiagnostic:' : 'reportError:';
|
| + sendCommand(cmd + id);
|
| + return false;
|
| }
|
| </script>
|
| </head>
|
|
|
| <body oncontextmenu="return false;">
|
| -<div class="background"><img src="ssl_roadblock_background.png" width="100%" height="100%" alt="background" onmousedown="return false;"/></div>
|
| +<div class="background">
|
| + <img src="ssl_roadblock_background.png" width="100%" height="100%"
|
| + alt="background" onmousedown="return false;">
|
| +</div>
|
| <table width="100%" cellspacing="0" cellpadding="0">
|
| <td class="cell" valign="middle" align="center">
|
| <div class="box">
|
| - <div class="icon"><img src="shared/images/phishing_icon.png" alt="Malware Icon" onmousedown="return false;"/></div>
|
| + <div class="icon">
|
| + <img src="shared/images/phishing_icon.png" alt="Malware Icon"
|
| + onmousedown="return false;">
|
| + </div>
|
| <div class="title" i18n-content="headLine"></div>
|
| <div class="main" i18n-values=".innerHTML:description1"></div>
|
| <div class="main" i18n-content="description2"></div>
|
| - <div class="main" id="template_root">
|
| + <div class="main">
|
| <table cellpadding="5" jsvalues="$counter:{value: 0}">
|
| <tr jsselect="errors" class="errorlist">
|
| <td jscontent="typeLabel"></td>
|
| <td jscontent="url"></td>
|
| - <td><a href="" onclick="var id= this.getAttribute('chromiumID'); this.getAttribute('chromiumIsMalware') ? showDiagnostic(id) : reportError(id); return false;" jscontent="errorLink" jsvalues="chromiumID:$counter.value;chromiumIsMalware:type=='malware'" jseval="$counter.value++"></a></td>
|
| + <td><a href="" onclick="showOrReport(event)"
|
| + jsvalues="chromiumID:$counter.value;chromiumIsMalware:type=='malware'"
|
| + jscontent="errorLink" jseval="$counter.value++"></a></td>
|
| </tr>
|
| </table>
|
| </div>
|
|
|
| - <div class="main"><a href="" i18n-content="description3" onclick="learnMore(); return false;" onmousedown="return false;"></a></div>
|
| + <div class="main">
|
| + <a href="" i18n-content="description3" onmousedown="return false;"
|
| + onclick="learnMore(); return false;"></a>
|
| + </div>
|
| <div class="main">
|
| <form class="submission">
|
| - <input name="checky" id="checky" type="checkbox" onclick="agreed(this.form)"> <label for="checky" i18n-content="confirm_text"></label>
|
| - <input type="button" name="continue_button" i18n-values="value:continue_button" disabled="true" onclick="proceed();"><br>
|
| - <input type="button" name="back_button" i18n-values="value:back_button" onclick="takeMeBack()">
|
| + <input id="checky" name="checky" type="checkbox"
|
| + jsdisplay="!proceedDisabled"
|
| + onclick="agreed(this.form)">
|
| + <label for="checky" i18n-content="confirm_text"
|
| + jsdisplay="!proceedDisabled"></label>
|
| + <button name="continue_button" i18n-content="continue_button"
|
| + disabled="true" jsdisplay="!proceedDisabled"
|
| + onclick="proceed();"></button><br>
|
| + <button name="back_button" i18n-content="back_button"
|
| + onclick="takeMeBack()"></button>
|
| </form>
|
| </div>
|
| </div>
|
|
|