diff options
Diffstat (limited to 'data/extensions/https-everywhere@eff.org/pages/popup')
3 files changed, 31 insertions, 25 deletions
diff --git a/data/extensions/https-everywhere@eff.org/pages/popup/index.html b/data/extensions/https-everywhere@eff.org/pages/popup/index.html index 03f76d2..9116280 100644 --- a/data/extensions/https-everywhere@eff.org/pages/popup/index.html +++ b/data/extensions/https-everywhere@eff.org/pages/popup/index.html @@ -2,6 +2,7 @@ <html> <head> <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> <title data-i18n="about_ext_name"></title> <link href="style.css" rel="stylesheet"> @@ -32,9 +33,9 @@ </section> <section id="HttpNowhere" class="options settings_block" style="visibility: hidden;"> - <h1 id="HttpNowhere__header" data-i18n="menu_encryptAllSitesEligible"></h1> + <h1 id="HttpNowhere__header"></h1> <input aria-hidden="true" id="http-nowhere-checkbox" type="checkbox"><label id="http-nowhere-checkbox_label" aria-label="Toggle on or off" for="http-nowhere-checkbox"></label> - <h2 id="HttpNowhere__explained" data-i18n="menu_httpNoWhereExplained"></h2> + <h2 id="HttpNowhere__explained"></h2> </section> <section id="RuleManagement" class="settings_block"> diff --git a/data/extensions/https-everywhere@eff.org/pages/popup/style.css b/data/extensions/https-everywhere@eff.org/pages/popup/style.css index 6207daa..38a35ac 100644 --- a/data/extensions/https-everywhere@eff.org/pages/popup/style.css +++ b/data/extensions/https-everywhere@eff.org/pages/popup/style.css @@ -76,7 +76,6 @@ footer a.button { /* Elements */ .settings_block { - display: inline-block; padding: 5px 1em 20px 1em; border-bottom: var(--light-grey) solid 1px; } @@ -104,6 +103,7 @@ footer a.button { font-size: 12px; float: right; margin: 5px 0; + padding: 10px 0; } .see_more__arrow { @@ -261,7 +261,7 @@ input:checked+label:after { #StableRules h3 { float: left; - margin-left: 10px; + margin: 10px; } #StableRules h2 { margin-left: 10px; @@ -271,12 +271,11 @@ input:checked+label:after { border-radius: 20px; color: #fff; display: block; - float: right; + float: left; font-size: 12px; font-weight: bold; height: 15px; - margin-top: 10px; - margin-right: 55%; + margin-top: 8px; padding: 5px; text-align: center; width: 15px; diff --git a/data/extensions/https-everywhere@eff.org/pages/popup/ux.js b/data/extensions/https-everywhere@eff.org/pages/popup/ux.js index 142c372..48de5b1 100644 --- a/data/extensions/https-everywhere@eff.org/pages/popup/ux.js +++ b/data/extensions/https-everywhere@eff.org/pages/popup/ux.js @@ -13,8 +13,8 @@ function toggleRuleLine(event) { getTab(activeTab => { const set_ruleset = { - active: event.target.parentNode.firstChild.checked, - name: event.target.innerText, + active: event.target.checked, + name: event.target.parentNode.innerText, tab_id: activeTab.id, }; @@ -47,10 +47,10 @@ function toggleSeeMore(event) { if(arrow.classList.contains('down')) { arrow.classList.replace('down', 'up'); - text.innerText = 'See less'; + text.innerText = chrome.i18n.getMessage("menu_seeLess"); } else if (arrow.classList.contains('up')) { arrow.classList.replace('up', 'down'); - text.innerText = 'See more'; + text.innerText = chrome.i18n.getMessage("menu_seeMore"); } if (content.classList.contains('hide')) { @@ -69,9 +69,6 @@ function toggleSeeMore(event) { */ function appendRulesToListDiv(rulesets, list_div, ruleType) { if (rulesets && rulesets.length) { - let counter = rulesets.length; - let counterElement = document.querySelector("#RuleManagement--counter"); - counterElement.innerText = counter; // template parent block for each ruleset let templateLine = document.createElement("div"); templateLine.className = "rule checkbox"; @@ -111,6 +108,9 @@ function appendRulesToListDiv(rulesets, list_div, ruleType) { checkbox.checked = ruleset.active; text.innerText = ruleset.name; + // Add listener to capture the toggle event + line.addEventListener("click", toggleRuleLine); + if (ruleset.note && ruleset.note.length) { line.title = ruleset.note; @@ -136,8 +136,11 @@ function showHttpNowhereUI() { getOption_('httpNowhere', false, function(item) { if (item.httpNowhere) { e('http-nowhere-checkbox').checked = true; - e('HttpNowhere__header').innerText = 'Encrypt All Sites Eligible is ON'; - e('HttpNowhere__explained').innerText = 'Unencrypted requests are currently blocked'; + e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOn"); + e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedBlocked"); + } else { + e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOff"); + e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedAllowed"); } e('HttpNowhere').style.visibility = "visible"; }); @@ -151,10 +154,11 @@ function updateEnabledDisabledUI() { // Hide or show the rules sections if (item.globalEnabled) { document.body.className = "" + e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalEnable"); showHttpNowhereUI(); } else { document.body.className = "disabled"; - e('onoffswitch_label').innerText = 'HTTPS Everywhere is OFF'; + e('onoffswitch_label').innerText = chrome.i18n.getMessage("menu_globalDisable"); } }); } @@ -180,16 +184,18 @@ function toggleEnabledDisabled() { * @param activeTab */ function listRules(activeTab) { - sendMessage("get_active_rulesets", activeTab.id, function(rulesets) { + sendMessage("get_applied_rulesets", activeTab.id, function(rulesets) { if (rulesets) { + // show the number of potentially applicable rulesets + let counter = rulesets.length; + let counterElement = document.querySelector("#RuleManagement--counter"); + counterElement.innerText = counter; + const stableRules = rulesets.filter(ruleset => ruleset.default_state); const unstableRules = rulesets.filter(ruleset => !ruleset.default_state); appendRulesToListDiv(stableRules, e("StableRules"), 'stable'); appendRulesToListDiv(unstableRules, e("UnstableRules"), 'unstable'); - - // Add listener to capture the toggle event - e("add-new-rule-button").addEventListener("click", toggleRuleLine); } // Only show the "Add a rule" section if we're on an HTTPS page @@ -378,11 +384,11 @@ function toggleHttpNowhere() { setOption_('httpNowhere', enabled, () => { if (enabled) { chrome.tabs.reload(tab.id); - e('HttpNowhere__header').innerText = 'Encrypt All Sites Eligible is ON'; - e('HttpNowhere__explained').innerText = 'Unencrypted requests are currently blocked'; + e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOn"); + e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedBlocked"); } else { - e('HttpNowhere__header').innerText = 'Encrypt All Sites Eligible is OFF'; - e('HttpNowhere__explained').innerText = 'Unencrypted requests are currently allowed'; + e('HttpNowhere__header').innerText = chrome.i18n.getMessage("menu_encryptAllSitesEligibleOff"); + e('HttpNowhere__explained').innerText = chrome.i18n.getMessage("menu_httpNoWhereExplainedAllowed"); } }); }); |