diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json index ed20c30..0967c6f 100644 --- a/src/_locales/de/messages.json +++ b/src/_locales/de/messages.json @@ -45,7 +45,7 @@ }, "firstTimeDescPG2": { - "message": "Um Ihre Privatsphäre zu schützen, können Sie unten die Arten von Cookies auswählen, welche sie erlauben möchten. Sollte eine Website dadurch nicht mehr funktionieren, dann beschreiben Sie uns das Problem, und wir werden es bestmöglich versuchen zu korrigieren.", + "message": "Um Ihre Privatsphäre zu schützen, können Sie unten die Arten von Cookies auswählen, welche sie erlauben möchten. Diese Einstellungen lassen sich zu beliebiger Zeit anpassen. Sollte eine Website dadurch nicht mehr funktionieren, dann beschreiben Sie uns das Problem, und wir werden es bestmöglich versuchen zu korrigieren.", "description": "Description paragraph 2 seen on the first time setup page." }, @@ -60,22 +60,22 @@ }, "catNecessaryTitle": { - "message": "Strikt-Notwendige Cookies", + "message": "Strikt-Notwendige Cookies werden akzeptiert", "description": "Text next to the 'Necessary' checkbox." }, "catFunctionalityTitle": { - "message": "Funktionalitäts-Cookies", + "message": "Funktionalitäts-Cookies werden akzeptiert", "description": "Text next to the 'Functionality' checkbox." }, "catAnalyticsTitle" : { - "message": "Analytische Cookies", + "message": "Analytische Cookies werden akzeptiert", "description": "Text next to the 'Analytics' checkbox." }, "catAdvertisingTitle": { - "message": "Werbungs- und Tracking-Cookies", + "message": "Werbungs- und Tracking-Cookies werden akzeptiert", "description": "Text next to the 'Advertising' checkbox." }, @@ -120,7 +120,7 @@ }, "buttonExitSetup" : { - "message": "Gespeicherte Cookies Kategorisieren und Entfernen", + "message": "Gespeicherte Cookies kategorisieren und entfernen", "description": "Label for the close button on the first time setup" }, @@ -175,7 +175,7 @@ }, "currentCookieEnforceButton" : { - "message" : "Kategorisieren und Entfernen", + "message" : "Kategorisieren und entfernen", "description" : "Label on the button that performs the current cookie classification." }, @@ -504,7 +504,7 @@ }, "udButton": { - "message": "Cookie Konfiguration Öffnen", + "message": "Cookie Konfiguration öffnen", "description": "Button in the options page that opens the cookie config page" }, diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index f0a3a03..4e0e432 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -30,7 +30,7 @@ }, "feedbackPG1": { - "message": "To report a broken website or give us feedback, you can use the following link:", + "message": "To report a broken website or give us feedback, use the following link:", "description": "Feedback text pointing towards the Google Forms survey." }, @@ -45,7 +45,7 @@ }, "firstTimeDescPG2": { - "message": "Select the types of cookies you want to permit below. Note that the extension may make mistakes and can occasionally break website functionality. If this occurs, please report the issue so we can resolve the problem.", + "message": "Select the types of cookies you want to permit below. All of these options can be changed later. Note that the extension may make mistakes and can occasionally break website functionality. If this occurs, please report the issue so we can resolve the problem.", "description": "Description paragraph 2 seen on the first time setup page." }, @@ -60,22 +60,22 @@ }, "catNecessaryTitle": { - "message": "Strictly-Necessary Cookies", + "message": "Allow Strictly-Necessary Cookies", "description": "Text next to the 'Necessary' checkbox." }, "catFunctionalityTitle": { - "message": "Functionality Cookies", + "message": "Allow Functionality Cookies", "description": "Text next to the 'Functionality' checkbox." }, "catAnalyticsTitle" : { - "message": "Analytics Cookies", + "message": "Allow Analytics Cookies", "description": "Text next to the 'Analytics' checkbox." }, "catAdvertisingTitle": { - "message": "Advertising/Tracking Cookies", + "message": "Allow Advertising/Tracking Cookies", "description": "Text next to the 'Advertising' checkbox." }, @@ -414,7 +414,7 @@ }, "cookieConfigListTitle" : { - "message": "Current Cookies", + "message": "Known Cookies", "description": "Header for the cookie list." }, diff --git a/src/manifest.json b/src/manifest.json index 73971e0..e95ed56 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "name": "__MSG_extensionName__", "author": "Information Security Group, ETH Zurich", "homepage_url": "https://github.com/dibollinger/CookieBlock", - "version": "0.9.0", + "version": "1.0.0", "incognito": "spanning", "default_locale": "en", diff --git a/src/options/cookieblock_cconfig.css b/src/options/cookieblock_cconfig.css index 7592317..1c105ea 100644 --- a/src/options/cookieblock_cconfig.css +++ b/src/options/cookieblock_cconfig.css @@ -142,6 +142,11 @@ hr.thick { width: 25em; } +.cconfig-title-element { + margin-top: 0.5em; + margin-bottom: 0.75em; +} + .cconfig-desc { display: inline; margin-top: 1.3em; @@ -162,6 +167,8 @@ hr.thick { } .cookie-name { + display:flex; + align-items: center; float:left; width:28em; text-overflow: ellipsis; diff --git a/src/options/cookieblock_cconfig.html b/src/options/cookieblock_cconfig.html index ce22b72..b97e272 100644 --- a/src/options/cookieblock_cconfig.html +++ b/src/options/cookieblock_cconfig.html @@ -24,11 +24,11 @@

-
+
-

-

+

+

diff --git a/src/options/cookieblock_cconfig.js b/src/options/cookieblock_cconfig.js index e194735..4971182 100644 --- a/src/options/cookieblock_cconfig.js +++ b/src/options/cookieblock_cconfig.js @@ -155,7 +155,10 @@ const constructCookieListEntry = function(cookies) { let domainDiv = document.createElement("div"); domainDiv.className = "cookie-name"; domainDiv.textContent = c.name; + let buttonDiv = document.createElement("div"); + buttonDiv.style = "display: flex; align-items:center;" subListItem.appendChild(domainDiv); + subListItem.appendChild(buttonDiv); let selection = document.createElement("select"); selection.className = "cat-selector"; @@ -177,11 +180,11 @@ const constructCookieListEntry = function(cookies) { selection.add(option); } selection.addEventListener("change", (ev) => { updateLabel(c, ev.target); }); - subListItem.appendChild(selection); + buttonDiv.appendChild(selection); let button = document.createElement("button"); button.className = "item-button"; - subListItem.appendChild(button); + buttonDiv.appendChild(button); (async () => { if (await existsCookie(c)){ button.textContent = chrome.i18n.getMessage("configButtonRemove"); @@ -238,14 +241,15 @@ const constructPlaceholderEntry = function() { } const constructDomainListEntry = function(domain, path, cookies) { - - // First construct the domain entry let listEntry = document.createElement("li"); let domainDiv = document.createElement("div"); domainDiv.className = "domain-entry"; domainDiv.style.fontWeight = "bold"; domainDiv.textContent = domain + path; + let buttonDiv = document.createElement("div"); + buttonDiv.style = "display: flex;align-items:center;height: 4em;"; + let optionFalse = document.createElement("option"); optionFalse.value = false; optionFalse.textContent = chrome.i18n.getMessage("configDropdownFalse") @@ -276,9 +280,12 @@ const constructDomainListEntry = function(domain, path, cookies) { await refreshButtons(); }); + buttonDiv.appendChild(selection); + buttonDiv.appendChild(button); listEntry.appendChild(domainDiv); - listEntry.appendChild(selection); - listEntry.appendChild(button); + listEntry.appendChild(buttonDiv); + + listEntry.style="vertical-align: middle;"; domainListElem.appendChild(listEntry); let placeholder = document.createElement("li"); @@ -286,7 +293,8 @@ const constructDomainListEntry = function(domain, path, cookies) { domainListElem.appendChild(placeholder); let objectCache = { "placeholder": placeholder, "listEntry": null }; - domainDiv.addEventListener("click", () => { + let onclickDomainEntry = function() + { if (!objectCache.listEntry) { objectCache.listEntry = constructCookieListEntry(cookies); } @@ -296,7 +304,8 @@ const constructDomainListEntry = function(domain, path, cookies) { } else { objectCache.placeholder.replaceWith(objectCache.listEntry); } - }); + } + domainDiv.addEventListener("click", onclickDomainEntry); } diff --git a/src/options/cookieblock_options.html b/src/options/cookieblock_options.html index 86b718c..4fe5fd1 100644 --- a/src/options/cookieblock_options.html +++ b/src/options/cookieblock_options.html @@ -22,19 +22,12 @@

-
-
-
-

-

-

- https://forms.gle/tL21ruvPZq2q218P8 -

- https://github.com/dibollinger/CookieBlock -
-
-
+

+ https://forms.gle/tL21ruvPZq2q218P8 +

+ https://github.com/dibollinger/CookieBlock +
diff --git a/src/options/cookieblock_options.js b/src/options/cookieblock_options.js index 349e8f3..a8e33ba 100644 --- a/src/options/cookieblock_options.js +++ b/src/options/cookieblock_options.js @@ -109,8 +109,6 @@ const setupLocalization = function () { setStaticLocaleText("settings_subtitle", "settingsSubtitle"); // Description - setStaticLocaleText("options-desc1","firstTimeDescPG1"); - setStaticLocaleText("options-desc2","firstTimeDescPG2"); setStaticLocaleText("feedback-pg1","feedbackPG1"); setStaticLocaleText("feedback-pg2","feedbackPG2");