Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

XWIKI-21776: Admin section: make the Notifications section pass webstandard tests #2801

Merged
merged 3 commits into from
Feb 23, 2024
Merged

XWIKI-21776: Admin section: make the Notifications section pass webstandard tests #2801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2780dd4
XWIKI-21776: Admin section: make the Notifications section pass webst…
Sereza7 Jan 17, 2024
e213059
Merge branch 'xwiki:master' into XWIKI-21776
Sereza7 Feb 13, 2024
8fb8f86
XWIKI-21776: Admin section: make the Notifications section pass webst…
Sereza7 Feb 14, 2024
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
1 change: 1 addition & 0 deletions ...rnate-ui/src/main/resources/XWiki/Notifications/Code/LegacyNotificationAdministration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ $services.localization.use('document', 'XWiki.Notifications.Code.LegacyNotificat
<div>
<input type="radio" id="mode_since" name="mode" value="since"#if($request.mode == 'since')checked#end/>
<label for="mode_since">$escapetool.html($services.localization.render('legacy.event.migration.since'))</label>
<label for="since" class="sr-only">$escapetool.html($services.localization.render('legacy.event.migration.since.picker.label'))</label>
<input type="date" id="since" name="since"#if($request.since) value="$escapetool.xml($request.since)"#end max="$datetool.format('yyyy-MM-dd', $datetool.date)"/>
</div>
<div class="buttons"><span class="buttonwrapper"><input type="submit" value="$escapetool.xml($services.localization.render('legacy.event.migration.start'))" name="migrate" class="button"/></span></div>
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/resources/XWiki/Notifications/Code/NotificationsApplicationsPreferencesMacro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ require(['jquery', 'xwiki-meta', 'ApplicationWidget', 'xwiki-bootstrap-switch',
{{html clean="false"}}
<div class="xform">
<p class="xHint">$escapetool.xml($services.localization.render('notifications.settings.applications.hint'))</p>
<table class="notifPreferences" data-target="$escapetool.xml($wikimacro.parameters.target)" $divData>
<table class="notifPreferences" data-target="$escapetool.xml($wikimacro.parameters.target)" $!divData>
<thead>
<tr>
<th scope="col">$escapetool.xml($services.localization.render('notifications.settings.applications.appName'))</th>
Expand Down
2 changes: 1 addition & 1 deletion ...ons-ui/src/main/resources/XWiki/Notifications/Code/NotificationsEmailPreferencesMacro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
<div class="xform">
<dl>
<dt><label for='preference_notification_email_frequency'>$escapetool.xml($services.localization.render('notifications.settings.email.frequency'))</label>
<p id='preference_notification_email_frequency_hint'class="xHint">$escapetool.xml($services.localization.render('notifications.settings.email.frequency.hint'))</p>
<p id='preference_notification_email_frequency_hint' class="xHint">$escapetool.xml($services.localization.render('notifications.settings.email.frequency.hint'))</p>
</dt>
<dd>
#if ($wikimacro.parameters.target == 'user')
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/resources/XWiki/Notifications/Code/NotificationsSystemFiltersPreferencesMacro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ path=$services.webjars.url('org.xwiki.platform:xwiki-platform-notifications-webj
### MACRO CONTENT
######################################################
{{html clean="false"}}
<div class="systemFilterPreferences xform" data-target="$escapetool.xml($wikimacro.parameters.target)" $divData>
<div class="systemFilterPreferences xform" data-target="$escapetool.xml($wikimacro.parameters.target)" $!divData>
<div class="row">
<p class="xHint col-xs-12 col-sm-9 col-md-8 col-lg-9">
$escapetool.xml($services.localization.render('notifications.settings.filters.preferences.system.hint'))
Expand Down
3 changes: 1 addition & 2 deletions ...bution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,7 @@
/xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=Likes
/xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=Mentions
/xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&section=MessageStream
<!-- /xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Notifications
TODO https://jira.xwiki.org/browse/XWIKI-21776 -->
/xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=Notifications
<!-- Wikis -->
/xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=wikis.descriptor
/xwiki/bin/admin/XWiki/XWikiPreferences?editor=globaladmin&amp;section=wikis.templates
Expand Down
Loading