Skip to content

XWIKI-23129: Add an end of DOM UIXP #4085

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

XWIKI-23129: Add an end of DOM UIXP #4085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0c17e0
XWIKI-23129: Add an `end of DOM` UIXP
Sereza7 Apr 22, 2025
9d63d7b
XWIKI-23129: Add an `end of DOM` UIXP
Sereza7 Apr 23, 2025
58fe35e
XWIKI-23129: Add an `end of DOM` UIXP
Sereza7 Apr 23, 2025
af1cfdf
XWIKI-23129: Add an `end of DOM` UIXP
Sereza7 Apr 24, 2025
71f191b
XWIKI-23129: Add an `end of DOM` UIXP
Sereza7 Apr 24, 2025
0659e94
XWIKI-23129: Add an `end of DOM` UIXP
Sereza7 Apr 24, 2025
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
6 changes: 6 additions & 0 deletions xwiki-platform-core/xwiki-platform-bootstrap/src/main/less/modals.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
// Prevent Chrome on Windows from adding a focus outline. For details, see
// https://github.com/twbs/bootstrap/pull/10951.
outline: 0;

// If this element is a dialog, we want to reset those default styles. The children elements are the ones painted.
dialog& {
background-color: transparent;
border: 0;
}

// When fading in the modal, animate it to slide down
&.fade .modal-dialog {
Expand Down
8 changes: 4 additions & 4 deletions ...o-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/export_modal.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*#
#macro(exportModal)
#set ($discard = $xwiki.jsfx.use('uicomponents/exporter/exporter.js', {'forceSkinAction': true}))
<div class="modal fade text-left" id="exportModal" tabindex="-1" role="dialog" aria-labelledby="exportModalLabel"
<dialog class="modal fade text-left" id="exportModal" aria-labelledby="exportModalLabel"
aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
Expand All @@ -46,7 +46,7 @@
</div>
</div>
</div>
</div>
</dialog>
#if ($doc.documentReference.name == 'WebHome' && $xwiki.exists('XWiki.ExportDocumentTree'))
#exportTreeModal()
#end
Expand Down Expand Up @@ -203,7 +203,7 @@
#end
##
#macro(exportTreeModal)
<div class="modal fade text-left" id="exportTreeModal" tabindex="-1" role="dialog"
<dialog class="modal fade text-left" id="exportTreeModal"
aria-labelledby="exportTreeModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
Expand Down Expand Up @@ -237,5 +237,5 @@
</div>
</div>
</div>
</div>
</dialog>
#end
4 changes: 0 additions & 4 deletions ...-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/menus_content.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@
## Note: Both the admin actions and the more actions menus are now merged into one.
#if ($displayAdminMenu || $displayMoreActionsMenu)
#displayOptionsMenu()
#if ($canView)
#template("export_modal.vm")
#exportModal()
#end
#end
#end
#set ($discard = $topStaticExtensions.add( { 'content': "$!actionsMenu", 'order': 40000}))
Expand Down
200 changes: 175 additions & 25 deletions ...rm-notifications-ui/src/main/resources/XWiki/Notifications/Code/NotificationsWatchUIX.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,17 +502,6 @@
#set($discard = $xwiki.ssx.use('XWiki.Notifications.Code.NotificationsWatchUIX'))
#set($discard = $xwiki.jsx.use('XWiki.Notifications.Code.NotificationsWatchUIX'))
#set ($watchedStatus = $services.notification.watch.getLocationWatchedStatus($doc))
## If the watched status informs that the filter is about children it means it's a filter for the space,
## so we should look for ancestor of the space.
#set ($refForAncestorFirstFilter = $doc.getDocumentReference())
#if ($watchedStatus == 'WATCHED_WITH_CHILDREN_FOR_ALL_EVENTS_AND_FORMATS' || $watchedStatus == 'BLOCKED_WITH_CHILDREN_FOR_ALL_EVENTS_AND_FORMATS')
#set ($refForAncestorFirstFilter = $doc.getDocumentReference().parent)
#end
#set ($ancestorFirstFilter = $services.notification.watch.getFirstFilteredAncestor($refForAncestorFirstFilter))
#if ($ancestorFirstFilter)
#set ($ancestorRef = $ancestorFirstFilter.left)
#set ($ancestorWatchStatus = $ancestorFirstFilter.right)
#end
## FIXME: the different icons should use the icon service
#set ($iconWhenWatched = 'fa-bell')
#set ($iconWhenNotSet = 'fa-bell-o')
Expand All @@ -531,8 +520,159 @@
#set ($watchIcon = $iconWhenCustom)
#set ($watchText = $services.localization.render('notifications.watch.button.status.custom', 'html/5.0', []))
#end
## TODO: better way for that?
#set ($isTerminal = ($doc.getDocumentReference().name != 'WebHome'))
#set ($buttonTitle = $services.localization.render('notifications.watch.button.title', [$watchText]))
{{html clean='false'}}
&lt;div class="btn-group" id="watchButton">
&lt;a href="#" role="button" title="$escapetool.xml($buttonTitle)" class="btn btn-default" data-toggle="modal" data-target="#watchModal">
&lt;span class="fa $watchIcon">&lt;/span> $watchText
&lt;/a>
&lt;/div>
{{/html}}
#end
{{/velocity}}
</content>
</property>
<property>
<extensionPointId>org.xwiki.plaftorm.menu.content</extensionPointId>
</property>
<property>
<name>org.xwiki.platform.notification.watch</name>
</property>
<property>
<parameters>order=39000</parameters>
</property>
<property>
<scope>wiki</scope>
</property>
</object>
<object>
<name>XWiki.Notifications.Code.NotificationsWatchUIX</name>
<number>1</number>
<className>XWiki.UIExtensionClass</className>
<guid>ad3c491c-2532-48c7-8559-286a36a90cfb</guid>
<class>
<name>XWiki.UIExtensionClass</name>
<customClass/>
<customMapping/>
<defaultViewSheet/>
<defaultEditSheet/>
<defaultWeb/>
<nameField/>
<validationScript/>
<async_cached>
<defaultValue>0</defaultValue>
<disabled>0</disabled>
<displayFormType>select</displayFormType>
<displayType/>
<name>async_cached</name>
<number>3</number>
<prettyName>Cached</prettyName>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
</async_cached>
<async_context>
<cache>0</cache>
<disabled>0</disabled>
<displayType>select</displayType>
<freeText>forbidden</freeText>
<largeStorage>0</largeStorage>
<multiSelect>1</multiSelect>
<name>async_context</name>
<number>4</number>
<prettyName>Context elements</prettyName>
<relationalStorage>0</relationalStorage>
<separator>, </separator>
<separators>|, </separators>
<size>5</size>
<unmodifiable>0</unmodifiable>
<values>action=Action|doc.reference=Document|doc.revision|icon.theme=Icon theme|locale=Language|rendering.defaultsyntax=Default syntax|rendering.restricted=Restricted|rendering.targetsyntax=Target syntax|request.base=Request base URL|request.cookies|request.headers|request.parameters=Request parameters|request.remoteAddr|request.session|request.url=Request URL|request.wiki=Request wiki|sheet|user=User|wiki=Wiki</values>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</async_context>
<async_enabled>
<defaultValue>0</defaultValue>
<disabled>0</disabled>
<displayFormType>select</displayFormType>
<displayType/>
<name>async_enabled</name>
<number>2</number>
<prettyName>Asynchronous rendering</prettyName>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
</async_enabled>
<content>
<disabled>0</disabled>
<editor>Text</editor>
<name>content</name>
<number>1</number>
<prettyName>Executed Content</prettyName>
<restricted>0</restricted>
<rows>25</rows>
<size>120</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</content>
<extensionPointId>
<disabled>0</disabled>
<name>extensionPointId</name>
<number>5</number>
<prettyName>Extension Point ID</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</extensionPointId>
<name>
<disabled>0</disabled>
<name>name</name>
<number>6</number>
<prettyName>Extension ID</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</name>
<parameters>
<contenttype>PureText</contenttype>
<disabled>0</disabled>
<editor>PureText</editor>
<name>parameters</name>
<number>7</number>
<prettyName>Extension Parameters</prettyName>
<restricted>0</restricted>
<rows>10</rows>
<size>40</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</parameters>
<scope>
<cache>0</cache>
<disabled>0</disabled>
<displayType>select</displayType>
<freeText>forbidden</freeText>
<largeStorage>0</largeStorage>
<multiSelect>0</multiSelect>
<name>scope</name>
<number>8</number>
<prettyName>Extension Scope</prettyName>
<relationalStorage>0</relationalStorage>
<separator> </separator>
<separators>|, </separators>
<size>1</size>
<unmodifiable>0</unmodifiable>
<values>wiki=Current Wiki|user=Current User|global=Global</values>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</scope>
</class>
<property>
<async_cached>0</async_cached>
</property>
<property>
<async_context/>
</property>
<property>
<async_enabled>0</async_enabled>
</property>
<property>
<content>{{velocity}}
#if (!$isGuest)
#macro (_displayOption $attributeName $optionValue $translationSuffix $iconName $panelClass)
&lt;div class="panel panel-default $panelClass"&gt;
&lt;div class="panel-radio"&gt;
Expand All @@ -554,6 +694,23 @@
&lt;/div&gt;&lt;!-- end collapsed xhint --&gt;
&lt;/div&gt;&lt;!-- end panel --&gt;
#end

#set ($watchedStatus = $services.notification.watch.getLocationWatchedStatus($doc))
## If the watched status informs that the filter is about children it means it's a filter for the space,
## so we should look for ancestor of the space.
#set ($refForAncestorFirstFilter = $doc.getDocumentReference())
#if ($watchedStatus == 'WATCHED_WITH_CHILDREN_FOR_ALL_EVENTS_AND_FORMATS' || $watchedStatus == 'BLOCKED_WITH_CHILDREN_FOR_ALL_EVENTS_AND_FORMATS')
#set ($refForAncestorFirstFilter = $doc.getDocumentReference().parent)
#end
#set ($ancestorFirstFilter = $services.notification.watch.getFirstFilteredAncestor($refForAncestorFirstFilter))
#if ($ancestorFirstFilter)
#set ($ancestorRef = $ancestorFirstFilter.left)
#set ($ancestorWatchStatus = $ancestorFirstFilter.right)
#end

## TODO: better way for that?
#set ($isTerminal = ($doc.getDocumentReference().name != 'WebHome'))

#set ($watchPageOption = "#_displayOption('watch-page','watchPage','watchpage','page','')")
#set ($watchSpaceOption = "#_displayOption('watch-space','watchSpace','watchspace','chart-organisation','')")
#set ($unwatchPageAndWatchSpaceOption = "#_displayOption('unwatch-page-watch-space','unwatchPageWatchSpace','watchspace','chart-organisation','')")
Expand All @@ -567,15 +724,8 @@
#set ($unblockPageOption = "#_displayOption('unblock-page','unblockPage','unblockpage','page','')")
#set ($unblockSpaceOption = "#_displayOption('unblock-space','unblockSpace','unblockspace','chart-organisation','')")
#set ($unblockWikiOption = "#_displayOption('unblock-wiki','unblockWiki','unblockwiki','world','wiki-option')")

#set ($buttonTitle = $services.localization.render('notifications.watch.button.title', [$watchText]))
{{html clean='false'}}
&lt;div class="btn-group" id="watchButton"&gt;
&lt;a href="#" role="button" title="$escapetool.xml($buttonTitle)" class="btn btn-default" data-toggle="modal" data-target="#watchModal"&gt;
&lt;span class="fa $watchIcon"&gt;&lt;/span&gt; $watchText
&lt;/a&gt;
&lt;/div&gt;
&lt;div class="modal fade" tabindex="-1" role="dialog" id="watchModal"&gt;
&lt;dialog class="modal fade" id="watchModal"&gt;
&lt;div class="modal-dialog" role="document"&gt;
&lt;div class="modal-content"&gt;
&lt;div class="modal-header"&gt;
Expand Down Expand Up @@ -682,19 +832,19 @@
&lt;/div&gt;
&lt;/div&gt;&lt;!-- /.modal-content --&gt;
&lt;/div&gt;&lt;!-- /.modal-dialog --&gt;
&lt;/div&gt;&lt;!-- /.modal --&gt;
&lt;/dialog&gt;&lt;!-- /.modal --&gt;
{{/html}}
#end
{{/velocity}}</content>
</property>
<property>
<extensionPointId>org.xwiki.plaftorm.menu.content</extensionPointId>
<extensionPointId>org.xwiki.platform.template.body.end</extensionPointId>
</property>
<property>
<name>org.xwiki.platform.notification.watch</name>
<name>org.xwiki.platform.notification.watchModal</name>
</property>
<property>
<parameters>order=39000</parameters>
<parameters></parameters>
</property>
<property>
<scope>wiki</scope>
Expand Down
11 changes: 11 additions & 0 deletions ...wiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/htmlfooter.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
#if ($services.debug.isEnabled())
#template('debug.vm')
#end
<div class="modal-container">
#if (($displayAdminMenu || $displayMoreActionsMenu) && $canView)
#template("export_modal.vm")
#exportModal()
#end
## We don't care about order for this extension point, none of the extensions should have 'visible' content.
## The primary use of this extension point is to gather modal elements that did not get loaded asynchronously.
#foreach ($uix in $services.uix.getExtensions('org.xwiki.platform.template.body.end'))
$services.rendering.render($uix.execute(), 'xhtml/1.0')
#end
</div>
</body>
</html>
#else ## Portlet Mode
Expand Down