CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-20 12:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve dialog

Browse Source
This commit is contained in:
Raphael Michel
2021-11-20 12:08:47 +01:00
committed by Raphael Michel
parent 61243e4a5a
commit 756c004d66
3 changed files with 138 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/presale/cookies.py
+64
View File
@@ -0,0 +1,64 @@
#
# This file is part of pretix (Community Edition).
#
# Copyright (C) 2014-2020 Raphael Michel and contributors
# Copyright (C) 2020-2021 rami.io GmbH and contributors
#
# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
# Public License as published by the Free Software Foundation in version 3 of the License.
#
# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
# this file, see <https://pretix.eu/about/en/license>.
#
# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
# details.
#
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
# <https://www.gnu.org/licenses/>.
#
# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of
# the Apache License 2.0 can be obtained at <http://www.apache.org/licenses/LICENSE-2.0>.
#
# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A
# full history of changes and contributors is available at <https://github.com/pretix/pretix>.
#
# This file contains Apache-licensed contributions copyrighted by: Tobias Kunze
#
# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under the License.
from enum import Enum
from typing import List
from pretix.presale.signals import register_cookie_providers
class UsageClass(Enum):
FUNCTIONAL = 1
ANALYTICS = 2
MARKETING = 3
SOCIAL = 4
class CookieProvider:
def __init__(self, identifier: str, usage_classes: List[UsageClass], provider_name: str, privacy_url: str = None, **kwargs):
self.identifier = identifier
self.usage_classes = usage_classes
self.provider_name = provider_name
self.privacy_url = privacy_url
def get_cookie_providers(event, request):
c = [
]
for receiver, response in register_cookie_providers.send(event, request=request):
if isinstance(response, list):
c += response
else:
c.append(response)
c.sort(key=lambda k: str(k.provider_name))
return c
src/pretix/presale/templates/pretixpresale/fragment_modals.html
+3 -3
View File
@@ -17,7 +17,7 @@
</div>
</div>
</div>
{% if request.organizer and cookie_providers %}
{% if request.organizer and request.organizer.settings.cookie_consent and cookie_providers %}
<script type="text/plain" id="cookie-consent-storage-key">cookie-consent-{{ request.organizer.slug }}</script>
<div id="cookie-consent-modal" hidden aria-live="polite">
<div class="modal-card">
@@ -35,11 +35,11 @@
<details id="cookie-consent-details">
<summary>
<span class="fa fa-fw chevron"></span>
{% trans "Detail settings" %}
{% trans "Adjust settings in detail" %}
</summary>
<div class="checkbox">
<label>
<input type="checkbox" name="functional" disabled checked="">
<input type="checkbox" disabled checked="">
{% trans "Required cookies" %}<br>
<span class="text-muted">
{% trans "Functional cookies (e.g. shopping cart, login, payment, language preference) and technical cookies (e.g. security purposes)" %}
src/pretix/static/pretixpresale/js/ui/cookieconsent.js
+71 -42
View File
@@ -3,48 +3,77 @@
window.__pretix_cookie_update_listeners = window.__pretix_cookie_update_listeners || []
$(function () {
var storage_key = $("#cookie-consent-storage-key").text();
if (!window.localStorage[storage_key]) {
$("#cookie-consent-modal").show();
}
$("#cookie-consent-button-yes").on("click", function () {
window.localStorage[storage_key] = JSON.stringify({
'functionality': true,
'ad': true,
'analytics': true,
'social': true,
})
for (var k of window.__pretix_cookie_update_listeners) {
k.call(this, window.localStorage[storage_key])
}
$("#cookie-consent-modal").hide()
})
$("#cookie-consent-button-no").on("click", function () {
window.localStorage[storage_key] = JSON.stringify({
'functionality': true,
'ad': false,
'analytics': false,
'social': false,
})
for (var k of window.__pretix_cookie_update_listeners) {
k.call(this, window.localStorage[storage_key])
}
$("#cookie-consent-modal").hide()
})
$("#cookie-consent-details").on("toggle", function (e) {
if ($("#cookie-consent-details").attr("open")) {
$("#cookie-consent-button-no").text(
$("#cookie-consent-button-no").attr("data-detail-text")
)
var storage_key = $("#cookie-consent-storage-key").text()
var storage_val = window.localStorage[storage_key]
var show_dialog = false
if (!storage_val) {
show_dialog = true
storage_val = {}
} else {
$("#cookie-consent-button-no").text(
$("#cookie-consent-button-no").attr("data-summary-text")
)
storage_val = JSON.parse(storage_val)
$("#cookie-consent-details input[type=checkbox][name]").each(function () {
if (typeof storage_val[$(this).attr("name")] === "undefined") {
// A new cookie type has been added that we haven't asked for yet
show_dialog = true
} else if (storage_val[$(this).attr("name")]) {
$(this).prop("checked", true)
}
})
}
})
$("#cookie-consent-reopen").on("click", function (e) {
$("#cookie-consent-modal").show()
e.preventDefault()
return true
})
function _set_button_text () {
if ($("#cookie-consent-details input[type=checkbox][name]:checked").length > 0) {
$("#cookie-consent-button-no").text(
$("#cookie-consent-button-no").attr("data-detail-text")
)
} else {
$("#cookie-consent-button-no").text(
$("#cookie-consent-button-no").attr("data-summary-text")
)
}
}
var n_checked = $("#cookie-consent-details input[type=checkbox][name]:checked").length
var n_total = $("#cookie-consent-details input[type=checkbox][name]").length
if (n_checked !== n_total && n_checked !== 0) {
$("#cookie-consent-details").prop("open", true)
$("#cookie-consent-details > *:not(summary)").show()
}
_set_button_text()
if (show_dialog) {
$("#cookie-consent-modal").show();
}
$("#cookie-consent-button-yes").on("click", function () {
var new_value = {}
$("#cookie-consent-details input[type=checkbox][name]").each(function () {
new_value[$(this).attr("name")] = true
$(this).prop("checked", true)
})
window.localStorage[storage_key] = JSON.stringify(new_value)
for (var k of window.__pretix_cookie_update_listeners) {
k.call(this, window.localStorage[storage_key])
}
$("#cookie-consent-modal").hide()
})
$("#cookie-consent-button-no").on("click", function () {
var new_value = {}
$("#cookie-consent-details input[type=checkbox][name]").each(function () {
new_value[$(this).attr("name")] = $(this).prop("checked")
})
window.localStorage[storage_key] = JSON.stringify(new_value)
for (var k of window.__pretix_cookie_update_listeners) {
k.call(this, window.localStorage[storage_key])
}
$("#cookie-consent-modal").hide()
})
$("#cookie-consent-details input").on("change", _set_button_text)
$("#cookie-consent-reopen").on("click", function (e) {
$("#cookie-consent-modal").show()
e.preventDefault()
return true
})
});