mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6646 from iMattPro/ticket/17344

Browse Source 
Ticket/17344 User Experience improvements to web push subscriptions
This commit is contained in:
Marc Alexander
2024-06-25 21:23:59 +02:00
committed by GitHub
parent e7b5053d92 16743e9345
commit 1dacbf6bde
9 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/styles/prosilver/template/notification_dropdown.html
View File

@@ -45,10 +45,10 @@
<a href="{U_VIEW_ALL_NOTIFICATIONS}"><span>{L_SEE_ALL}</span></a>
</div>
{% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
<div class="notification-dropdown-footer">
<div class="footer webpush-subscribe">
<span class="ellipsis-text">{{ lang('NOTIFY_WEB_PUSH_ENABLE') ~ lang('COLON') }}</span>
<button id="subscribe_webpush" name="subscribe_webpush" class="notification-subscribe_toggle">{{ Icon('font', 'toggle-off', lang('NOTIFY_WEB_PUSH_SUBSCRIBE'), false, '', {'style' : 'color:#9e9e9e;'}) }}</button>
<button id="unsubscribe_webpush" name="unsubscribe_webpush" class="notification-subscribe_toggle hidden">{{ Icon('font', 'toggle-on', lang('NOTIFY_WEB_PUSH_SUBSCRIBED'), false, '', {'style' : 'color:#0059b3;'}) }}</button>
<button id="subscribe_webpush" name="subscribe_webpush" class="notification-subscribe-toggle" data-l-err="{{ lang('INFORMATION') }}" data-l-msg="{{ lang('NOTIFY_WEB_PUSH_DENIED') }}">{{ Icon('font', 'toggle-off', lang('NOTIFY_WEB_PUSH_SUBSCRIBE'), false, '', {'style' : 'color:#9e9e9e;'}) }}</button>
<button id="unsubscribe_webpush" name="unsubscribe_webpush" class="notification-subscribe-toggle hidden">{{ Icon('font', 'toggle-on', lang('NOTIFY_WEB_PUSH_SUBSCRIBED'), false, '', {'style' : 'color:#0059b3;'}) }}</button>
</div>
{% endif %}
{% EVENT notification_dropdown_footer_after %}

2
phpBB/styles/prosilver/template/ucp_notifications_options.html
View File

@@ -10,7 +10,7 @@
<dl>
<dt><label for="subscribe_webpush">{{ lang('NOTIFY_WEBPUSH_ENABLE') ~ lang('COLON') }}</label><br><span>{{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}</span></dt>
<dd>
<input id="subscribe_webpush" type="submit" name="subscribe_webpush" value="{{ lang('NOTIFY_WEBPUSH_SUBSCRIBE') }}" class="button1 button button-form">
<input id="subscribe_webpush" type="submit" name="subscribe_webpush" value="{{ lang('NOTIFY_WEBPUSH_SUBSCRIBE') }}" class="button1 button button-form" data-l-err="{{ lang('INFORMATION') }}" data-l-msg="{{ lang('NOTIFY_WEB_PUSH_DENIED') }}">
<input id="unsubscribe_webpush" type="submit" name="unsubscribe_webpush" value="{{ lang('NOTIFY_WEBPUSH_UNSUBSCRIBE') }}" class="button1 button button-form hidden">
</dd>
</dl>

2
phpBB/styles/prosilver/theme/buttons.css
View File

@@ -223,6 +223,6 @@ button::-moz-focus-inner {
/* Notification buttons
--------------------------------------------- */
.notification-subscribe_toggle:disabled {
.notification-subscribe-toggle:disabled {
opacity: 0.7;
}

6
phpBB/styles/prosilver/theme/colours.css
View File

@@ -1180,6 +1180,10 @@ input.disabled {
color: #ffffff;
}
.notification-subscribe_toggle {
.dropdown-extended .webpush-subscribe {
color: #536482;
}
.notification-subscribe-toggle {
color: #47536b;
}

4
phpBB/styles/prosilver/theme/common.css
View File

@@ -1340,13 +1340,13 @@ ul.linklist:after,
display: block;
}
.dropdown-extended .notification-dropdown-footer {
.dropdown-extended .webpush-subscribe {
white-space: nowrap;
border-top: solid 1px #b9b9b9;
display: flex;
flex-wrap: nowrap;
justify-content: space-between;
padding: 5px 10px;
gap: 20px;
}
.notification-avatar,

4
phpBB/styles/prosilver/theme/responsive.css
View File

@@ -18,6 +18,10 @@
.dropdown-extended .dropdown-contents {
width: auto;
}
.dropdown-extended .dropdown-contents .webpush-subscribe .notification-subscribe-toggle > span {
display: none;
}
}
@media (max-width: 430px) {