Skip to content
This repository has been archived by the owner on Nov 6, 2023. It is now read-only.

Change the open URL link to a button #17347

Merged
merged 2 commits into from
Feb 15, 2019
Merged

Change the open URL link to a button #17347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a93dbd8
Change the open URL link to a button
patch-malone Feb 3, 2019
693a86f
Update EASE mode langauge in interstitial page to reflect menu option
zoracon Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions chromium/pages/cancel/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,21 @@
<link rel="stylesheet" href="style.css" type="text/css" />
</head>
<body>
<h1 id="https-everywhere"><img src="../../images/banner-red.png" alt="HTTPS Everywhere" /></h1>
<p data-i18n="cancel_he_blocking_explainer"></p>
<p id="url-paragraph"><span id="url-label">URL: </span><a href="#" id="originURL"></a></p>
<script src="../translation.js"></script>
<script src="../util.js"></script>
<script src="ux.js"></script>
<div class="content">
<h1 id="https-everywhere"><img src="../../images/banner-red.png" alt="HTTPS Everywhere" /></h1>
<p data-i18n="cancel_he_blocking_explainer"></p>

<p id="url-paragraph">
<span id="url-label">URL: </span><a href="#" id="url-value">PLACEHOLDER</a>
patch-malone marked this conversation as resolved.
Show resolved Hide resolved
</p>

<form method="get" action="#" id="url-actions-form">
<button type="button" name="open" formaction="#" id="open-url-button" data-i18n="cancel_open_page">Open insecure page</button>
</form>

<script src="../translation.js"></script>
<script src="../util.js"></script>
<script src="ux.js"></script>
</div>
</body>
</html>
39 changes: 30 additions & 9 deletions chromium/pages/cancel/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,41 @@
body{
margin-top: 6em;
left: 50%;
position: relative;
overflow: hidden;
text-align: center;
}

h1 img{
position: relative;
left: -289px;
.content{
width: 600px;
margin: auto;
text-align: left;
}

p{
width: 600px;
position: relative;
left: -300px;
h1{
text-align: center;
}

form, button, p{
font-size: 12pt;
font-family: sans-serif;
line-height: 150%;
}

form{
overflow: auto;
margin-bottom: 1em;
}

form button{
padding: .5em 1em;
background-color: #aaa;
color: #fff;
border: none;
border-radius: 4px;
cursor: pointer;
}

#open-url-button{
display: inline-block;
float: left;
background-color: #ec1e1e;
}
11 changes: 8 additions & 3 deletions chromium/pages/cancel/ux.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,20 @@ function replaceLink(explainer) {
function displayURL() {
const cancelURL = new URL(window.location.href);
const originURL = decodeURI(cancelURL.searchParams.get('originURL'));
const originURLLink = document.getElementById('originURL');
originURLLink.innerText = originURL;
const originURLLink = document.getElementById('url-value');
const openURLButton = document.getElementById('open-url-button');

originURLLink.addEventListener("click", function() {
originURLLink.innerHTML = originURL;
originURLLink.href = originURL;

openURLButton.addEventListener("click", function() {
if (confirm(chrome.i18n.getMessage("chrome_disable_on_this_site") + '?')) {
const url = new URL(originURL);
sendMessage("disable_on_site", url.host, () => {
window.location = originURL;
});
}

return false;
});
}
3 changes: 2 additions & 1 deletion src/chrome/locale/en/https-everywhere.dtd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@
<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults">
<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?">

<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Block all unencrypted requests' option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit.">
<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Encrypt All Sites Eligible' (EASE) option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit.">
<!ENTITY https-everywhere.cancel.he_blocking_network "network-based downgrade attacks">
<!ENTITY https-everywhere.cancel.open_page "Open insecure page">

<!ENTITY https-everywhere.chrome.stable_rules "Stable rules">
<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:">
Expand Down